Skip to content
Commit b71cfcf4 authored by Pascal Dreissen's avatar Pascal Dreissen
Browse files

Merge branch 'applemooz_master' into 'master' 

# Conflicts:
#   interface/web/themes/default/assets/stylesheets/ispconfig.css
parents aa08fdb0 959d23da
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment