Skip to content
Snippets Groups Projects
Commit 4753cc3e authored by Brice Maron's avatar Brice Maron
Browse files

Merge branch 'master' into multi_app_dir 

Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
parents 6da5a2fd f3b30e46
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3017 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment