]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into no-inline-js
authorLukas Reschke <lukas@statuscode.ch>
Tue, 22 Jan 2013 10:50:33 +0000 (11:50 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Tue, 22 Jan 2013 10:50:33 +0000 (11:50 +0100)

Trivial merge