source.dussan.org Git - nextcloud-server.git/commit

]> source.dussan.org Git - nextcloud-server.git/commit

projects / nextcloud-server.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1dab076 02b2b5a)

author	Georg Ehrke <developer@georgehrke.com>
	Fri, 23 Aug 2013 21:10:37 +0000 (23:10 +0200)
committer	Georg Ehrke <developer@georgehrke.com>
	Fri, 23 Aug 2013 21:10:37 +0000 (23:10 +0200)
commit	6ffa2a28d0ae63b061e1e88ee3b12726d31c3f9d
tree	b564539f21866e6049d69da6d011647ff46540f7	tree \| snapshot
parent	1dab0767502013b5e86e8e24e3b12a2a8939f7a8	commit \| diff
parent	02b2b5a808b135007d8d54b837e70c38f02729fd	commit \| diff

Merge branch 'master' into oc_preview

apps/files/js/file-upload.js	diff1 \|	diff2 \|	blob \| history
apps/files_sharing/js/public.js	diff1 \|	diff2 \|	blob \| history
apps/files_trashbin/index.php	diff1 \|	diff2 \|	blob \| history
lib/base.php	diff1 \|	diff2 \|	blob \| history
lib/helper.php	diff1 \|	diff2 \|	blob \| history
lib/util.php	diff1 \|	diff2 \|	blob \| history

Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server