]> source.dussan.org Git - nextcloud-server.git/commit
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 16:08:49 +0000 (18:08 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 16:08:49 +0000 (18:08 +0200)
commit2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9
treef25b463c90992764887416c3082098fed6ecac65
parent40f95ffdf3edf9ab45c15bd5b9018d7f4d92baa9
parent127796218314c6b1f19ba86f74caa913375aac8d
fix merge conflicts
17 files changed:
apps/calendar/ajax/event/edit.form.php
apps/calendar/ajax/event/move.php
apps/calendar/ajax/event/resize.php
apps/calendar/ajax/events.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/js/contacts.js
apps/files/ajax/scan.php
apps/files/css/files.css
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/index.php
apps/files/templates/part.list.php
lib/base.php
lib/helper.php