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: 7e4dcd2 9be8368)

author	Georg Ehrke <developer@georgehrke.com>
	Mon, 19 Aug 2013 09:24:17 +0000 (11:24 +0200)
committer	Georg Ehrke <developer@georgehrke.com>
	Mon, 19 Aug 2013 09:24:17 +0000 (11:24 +0200)
commit	f2702ff1ca45d72300eed5dfa58ebc19aa6e9910
tree	b1424be17877cbd25bf3781600d353efd3dd0759	tree \| snapshot
parent	7e4dcd268f6cb6618600718a51c4d882e9027829	commit \| diff
parent	9be836814cb4165ea54a086a0f97526d783bcd37	commit \| diff

Merge master into oc_preview

12 files changed:

apps/files/css/files.css	diff1 \|	diff2 \|	blob \| history
apps/files/index.php	diff1 \|	diff2 \|	blob \| history
apps/files/js/file-upload.js	diff1 \|	diff2 \|	blob \| history
apps/files/js/filelist.js	diff1 \|	diff2 \|	blob \| history
apps/files/js/files.js	diff1 \|	diff2 \|	blob \| history
apps/files/templates/index.php	diff1 \|	diff2 \|	blob \| history
apps/files_sharing/public.php	diff1 \|	diff2 \|	blob \| history
apps/files_trashbin/lib/trash.php	diff1 \|	diff2 \|	blob \| history
core/css/styles.css	diff1 \|	diff2 \|	blob \| history
core/routes.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