ISPConfig3 devel
parent: 4a596d | patch | commitdiff
Marius Cramer
2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520
refs
author Marius Cramer <m.cramer@pixcept.de>
Sunday, February 15, 2015 08:13 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Sunday, February 15, 2015 08:13 -0500
commit427cd2f62e87fc13fee43ecf764418c7ca5ae520
tree 3e868d8af619ff6480a33ff6b1e88136ac701470 tree | zip | gz
parent 4a596d41473f37c5a12a041b4862813de3a7e503 view | diff
54afe0e3036f339e623e98f5d3fbb397376c7ca2 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !164
1 files added
28 files modified
2 files deleted
2638 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 2 ●●●●● diff | view | raw | blame | history
interface/web/tools/form/resync.tform.php 94 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ar_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/bg_resync.lng 60 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/br_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/cz_resync.lng 61 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/de_resync.lng 51 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/el_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/en_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/es_resync.lng 60 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fi_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/fr_resync.lng 56 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hr_resync.lng 57 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/hu_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/id_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/it_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ja_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/nl_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pl_resync.lng 58 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/pt_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ro_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/ru_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/se_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/sk_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/lang/tr_resync.lng 52 ●●●●● diff | view | raw | blame | history
interface/web/tools/lib/menu.d/resync.menu.php 3 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync.php 546 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync_do.php 383 ●●●●● diff | view | raw | blame | history
interface/web/tools/resync_show.php 114 ●●●●● diff | view | raw | blame | history
interface/web/tools/templates/resync.htm 254 ●●●●● diff | view | raw | blame | history
interface/web/vm/form/openvz_ip.tform.php 7 ●●●●● diff | view | raw | blame | history