ISPConfig3 devel
parent: 434186 | patch | commitdiff
Marius Cramer
2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, October 13, 2014 06:38 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, October 13, 2014 06:38 -0400
commit559b657f9fc6a5374de9b7b1caf20abd4e308d76
tree 1cce8dbd36174d6689ab240d1a6bf4a00600898b tree | zip | gz
parent 43418672d32ee65ee6060314d4e66c3c44a8b0cb view | diff
7a42487608541896b032765cfef008d53230765f view | diff 
Merge branch 'master' into 'master'

Master

Hello Marius,

just re-did it again and committed only files i changed.
Should be fine now. :-)

Jochen

See merge request !126
3 files deleted
6 files added
6 files modified
1068 ■■■■■ changed files
interface/web/client/templates/client_edit_limits.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery-1.6.3.min.js 4 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery-2.1.1.min.js 26 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery-ui-1.11.1.custom.min.js 13 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery-ui-1.8.16.custom.min.js 192 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery.combobox.js 129 ●●●●● diff | view | raw | blame | history
interface/web/js/jquery.tipsy.js 2 ●●●●● diff | view | raw | blame | history
interface/web/js/mail_domain_dkim.js 19 ●●●●● diff | view | raw | blame | history
interface/web/js/scrigo.js.php 14 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/jquery-ui-1.11.1.min.css 7 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/jquery-ui-1.11.1.structure.min.css 5 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/jquery-ui-1.11.1.theme.min.css 5 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/jquery-ui-1.8.16.custom.css 446 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/css/styles.css 63 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 135 ●●●●● diff | view | raw | blame | history