ISPConfig3 devel
parent: bfae4c | patch | commitdiff
Marius Cramer
2015-01-10 0d5e54e5a149a24f8cc04989be2e7611d98852a4
refs
author Marius Cramer <m.cramer@pixcept.de>
Saturday, January 10, 2015 09:49 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Saturday, January 10, 2015 09:49 -0500
commit0d5e54e5a149a24f8cc04989be2e7611d98852a4
tree d705b7bfb93339a2c37b138a18ed965c59343a8f tree | zip | gz
parent bfae4c80dd704ba11148d42e90105b38d45211fb view | diff
bb5ccb0028569fadceea2240d85a9aaf901ea588 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !152
3 files modified
1 files deleted
47 ■■■■■ changed files
install/sql/incremental/upd_0081.sql 19 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_dev_collection.sql 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_spf_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 2 ●●●●● diff | view | raw | blame | history