]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into close-session-faster-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 19 Mar 2014 10:44:21 +0000 (11:44 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 19 Mar 2014 10:44:21 +0000 (11:44 +0100)
commitc216c4777be147a04ab27c6af9e25e8b2fc9677d
treed6cb262ac0a1d697ea9a3edc413e43a3e95b57bc
parenteffea790c7200d1a9e5605407dcefc8ab71146b8
parentb9fc240b838439444061824cb191ce22c4c4c052
Merge branch 'master' into close-session-faster-master

Conflicts:
apps/files/ajax/upgrade.php