Marius Cramer
2014-07-01 dbf29d9979fe779e8801685c0132dbee681e15cf
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 1, 2014 12:39 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 1, 2014 12:39 -0400
commitdbf29d9979fe779e8801685c0132dbee681e15cf
tree 201c71f33ac44a0495b4ed0b734a554372cd7c7d tree | zip | gz
parent 47568c8833fcc26d53c32cb1369847c6dd40c384 view | diff
5dc7c8f6f604fb960e36d81e3a3d489f7852e723 view | diff
Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-master

Conflicts:
interface/lib/lang/es.lng
7 files modified
57 ■■■■ changed files
interface/lib/classes/auth.inc.php 2 ●●● diff | view | raw | blame | history
interface/lib/lang/en.lng 1 ●●●● diff | view | raw | blame | history
interface/lib/lang/es.lng 1 ●●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 30 ●●●● diff | view | raw | blame | history
interface/web/client/domain_list.php 5 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_edit.htm 8 ●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_list.htm 10 ●●●●● diff | view | raw | blame | history