diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 21:15:25 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-16 21:15:25 +0200 |
| commit | 221a650815800e47d6b2c9d7dfe0e9434ebc9edf (patch) | |
| tree | 1da8fba37b07bbfd600f98039335a612c351972e /lib/public/authentication | |
| parent | 852a50aa8968560738f61e32d8b1cb7f5cd329c1 (diff) | |
| parent | 2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a (diff) | |
| download | nextcloud-server-221a650815800e47d6b2c9d7dfe0e9434ebc9edf.tar.gz nextcloud-server-221a650815800e47d6b2c9d7dfe0e9434ebc9edf.zip | |
Merge branch 'master' into activities-api
Conflicts:
lib/private/server.php
Diffstat (limited to 'lib/public/authentication')
0 files changed, 0 insertions, 0 deletions