Skip to content
Snippets Groups Projects
Commit 18946440 authored by Gerrit Uitslag's avatar Gerrit Uitslag
Browse files

Merge remote-tracking branch 'origin/master' into remoteapiGetversions

Conflicts:
	lib/exe/xmlrpc.php
parents 33fe8b15 37c644e9
No related branches found
No related tags found
Loading
Showing
with 216 additions and 74 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