Marius Cramer
2015-02-16 14f5a343328f7db49008255211af7cf08342a83c
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, February 16, 2015 03:57 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Monday, February 16, 2015 03:57 -0500
commit14f5a343328f7db49008255211af7cf08342a83c
tree 162e0bc6c105dcf6225847ce3b528485aaac6941 tree | zip | gz
parent 427cd2f62e87fc13fee43ecf764418c7ca5ae520 view | diff
eac7f21ee36394351d11da1b42f1f3a415c4ab6f view | diff
Merge branch 'master' into 'master'

Master

See merge request !165
1 files modified
2 ■■■ changed files
install/sql/ispconfig3.sql 2 ●●● diff | view | raw | blame | history