phpservermon/src/lang
Pepijn Over 6b4668937d Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop
Conflicts:
	src/lang/de_DE.lang.php
	src/lang/en_US.lang.php
	src/psm/Module/Server/Controller/ServerController.class.php
	src/templates/server/view.tpl.html
2014-07-30 15:03:57 +02:00
..
bg_BG.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
da_DK.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
de_DE.lang.php Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
en_US.lang.php Merge branch 'develop' of https://github.com/remmedia/phpservermon into remmedia-develop 2014-07-30 15:03:57 +02:00
es_ES.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
fr_FR.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
it_IT.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
ko_KR.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
nl_NL.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
pt_BR.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
ru_RU.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00
zh_CN.lang.php issue #53: adding user selection to server edit page 2014-07-30 14:30:41 +02:00