diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-10-24 22:40:22 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-10-24 22:40:22 +0200 |
| commit | 9832a0817dfe975dd768e24b1f51b0591bbfa3b3 (patch) | |
| tree | 7252d1541e7b34ad1d04d7864f5ecd20b7154c4b /lib/group.php | |
| parent | dc9c5f10f57bf3d3c375e6fe1f89a358ca1947a8 (diff) | |
| parent | abf33d32b9987cc22cd42e6d65ac13720c7f1c7c (diff) | |
| download | nextcloud-server-9832a0817dfe975dd768e24b1f51b0591bbfa3b3.tar.gz nextcloud-server-9832a0817dfe975dd768e24b1f51b0591bbfa3b3.zip | |
Merge branch 'master' into fullcalendar
Conflicts:
apps/calendar/index.php
Diffstat (limited to 'lib/group.php')
0 files changed, 0 insertions, 0 deletions