]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into delete-fix
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 23 Jul 2013 14:24:34 +0000 (16:24 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 23 Jul 2013 14:24:34 +0000 (16:24 +0200)
commit2a420218156d1e4ed3f88a50fd3b0d60476eeeb9
treee0701915bb9a1fce746aff91fb6a4b99a13361b9
parentcdb993ad69969964c433cf414b549c52b298c67d
parenta94c55be987127d148b3a6d5820bf06fc9d74068
Merge branch 'master' into delete-fix

Conflicts:
core/css/styles.css
core/css/styles.css
core/js/js.js