]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fixing-3934-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 5 Jul 2013 11:52:33 +0000 (13:52 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 5 Jul 2013 11:52:33 +0000 (13:52 +0200)
commit59b700a5504549508ecde1f83469824840f55d90
tree90f867b7982d2b219713e6daf52576189a09fecb
parent13991be5ce6e318670b84458c2cdaa6878ad63cc
parent9c855f7b3d97b312095ba53a08fe45b71ca06c98
Merge branch 'master' into fixing-3934-master

Conflicts:
core/js/share.js
core/js/share.js