diff options
| author | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
|---|---|---|
| committer | Pellaeon Lin <nfsmwlin@gmail.com> | 2014-01-30 22:50:20 +0800 |
| commit | 099b71c712c38de7dac7e386252da02bb0cadf12 (patch) | |
| tree | 84bcf83efdc4cc759a5ff184fa5148195abaab51 /lib/public/groupinterface.php | |
| parent | 929c930b0afd682bb98eb389d7ebad91bb34d643 (diff) | |
| parent | 299a8285bd2601ccbac988b2e3e9b067d47921a2 (diff) | |
| download | nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.tar.gz nextcloud-server-099b71c712c38de7dac7e386252da02bb0cadf12.zip | |
Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
Diffstat (limited to 'lib/public/groupinterface.php')
0 files changed, 0 insertions, 0 deletions