]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71f9b19 07ff1e7)
Merge branch 'master' into tasks
authorBart Visscher <bartv@thisnet.nl>
Fri, 4 May 2012 15:04:11 +0000 (17:04 +0200)
committerBart Visscher <bartv@thisnet.nl>
Fri, 4 May 2012 15:04:11 +0000 (17:04 +0200)
1  2 
apps/calendar/lib/app.php patch | diff1 | diff2 | blob | history

diff --cc apps/calendar/lib/app.php
index 660aa928a76db83a56ef70bd2608e69c470308c3,f955c59603da39ff070bfaafdc8a1c7bab401880..98e430b88636651c4fbdc62be1e4e452b5d9a4bb
mode 100644,100755..100755
--- 1/apps/calendar/lib/app.php
--- 2/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server