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: 711aa22 1bba445)

author	Georg Ehrke <dev@georgswebsite.de>
	Sun, 22 Apr 2012 11:19:12 +0000 (13:19 +0200)
committer	Georg Ehrke <dev@georgswebsite.de>
	Sun, 22 Apr 2012 11:19:12 +0000 (13:19 +0200)
commit	4c2cf35050032002d01978f53201723330ebfe16
tree	cb931972aae1381d0d46aa934fa56f462e4c873a	tree \| snapshot
parent	711aa229b882d3fc5e2fa8c22e6db2ec05642984	commit \| diff
parent	1bba4456420d1824ab6d58f3d9bb523fcde5c4c2	commit \| diff

fix merge conflicts

16 files changed:

apps/calendar/ajax/changeview.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/delete.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/edit.form.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/edit.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/move.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/new.form.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/event/resize.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/events.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/import/import.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/share/changepermission.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/share/share.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/ajax/share/unshare.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/export.php	diff1 \|	diff2 \|	blob \| history
apps/calendar/index.php	diff1 \|	diff2 \|	blob \| history
apps/contacts/ajax/savecrop.php	diff1 \|	diff2 \|	blob \| history
apps/files/templates/admin.php	diff1 \|	\|	blob \| history

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