Marius Burkard
2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5
refs
author Marius Burkard <m.burkard@pixcept.de>
Monday, January 4, 2016 09:05 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Monday, January 4, 2016 09:05 -0500
commitcb287d1f1be13beaba7fe84c906dd0683dfb9fb5
tree f95db5e1a4e5fa30a6871e55f4c8564ead2aa69f tree | zip | gz
parent a4e127a6af97041b2c067f888f8c73a8aec682f1 view | diff
5693a2f95a72cf65dac5b44e4bb1f6afc2de9be2 view | diff
Merge branch 'mergebranch'
3 files modified
44 ■■■■ changed files
interface/web/themes/default/assets/javascripts/ispconfig.js 11 ●●●● diff | view | raw | blame | history
interface/web/themes/default/assets/javascripts/ispconfig.min.js 29 ●●●●● diff | view | raw | blame | history
interface/web/themes/default/templates/sidenav.tpl.htm 4 ●●●● diff | view | raw | blame | history