]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into issue_20427
authorJesus Macias Portela <jesus.macias.portela@gmail.com>
Thu, 3 Dec 2015 11:35:49 +0000 (12:35 +0100)
committerJesus Macias Portela <jesus.macias.portela@gmail.com>
Thu, 3 Dec 2015 11:35:49 +0000 (12:35 +0100)
commitdcfbbe4737e9939b6c038f8e48b49957c66a52e8
tree8163f2d7537708d7d5486a093bb3dab9cc63f9d2
parenta79ae4ae086c08c75a6d974966458251e2167347
parente62b6c1617886b2cdd7553ea9b119c431e4eb363
Merge branch 'master' into issue_20427
apps/files_external/js/app.js
tests/karma.config.js