Skip to content
GitLab
Explore
Sign in
Register
ISPConfig
ISPConfig 3
Repository
ispconfig3
interface
web
themes
default
templates
main.tpl.htm
Find file
Blame
History
Permalink
Merge remote-tracking branch 'ispc/master' into new-layout-3.1
· 62e25488
Marius Cramer
authored
Dec 19, 2014
Conflicts: interface/web/themes/default/templates/main.tpl.htm
62e25488