ISPConfig3 devel
parent: 7cbed0 | patch | commitdiff
Marius Cramer
2015-03-01 e2e00df25e5561131b5b50d332f0de712b4244c7
refs
author Marius Cramer <m.cramer@pixcept.de>
Sunday, March 1, 2015 11:55 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Sunday, March 1, 2015 11:55 -0500
commite2e00df25e5561131b5b50d332f0de712b4244c7
tree fdae36ed0abcc9b1cf11591de8dd148e9fca41f2 tree | zip | gz
parent 7cbed050417f967f34340661b7d7a8a7e42e5710 view | diff
c93956a2d58ec3d797d5f0dcea49afa7dc4a61da view | diff 
Merge branch 'master' into 'master'

Master

See merge request !169
1 files modified
6 ■■■■■ changed files
interface/web/tools/resync.php 6 ●●●●● diff | view | raw | blame | history