Skip to content
Snippets Groups Projects
Commit 9b0ee8d9 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
parents 60f2b476 3dc62994
No related branches found
No related tags found
Loading
Showing
with 159 additions and 11 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment