Skip to content
Snippets Groups Projects
Commit 2e1e2835 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'appframework-master' into activities-api

Conflicts:
	lib/public/iservercontainer.php
parents 1b59003d 5462e199
No related branches found
No related tags found
No related merge requests found
Showing
with 1686 additions and 642 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