diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-02 14:41:46 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-02 14:41:46 +0200 |
| commit | b918c06be60eea9edde26b05621898627c71130d (patch) | |
| tree | f16cbad18677ee2f3262474f5668603adf52896e /files | |
| parent | 4bbefdf608fdf930fa6fd1f783d6f58267752394 (diff) | |
| parent | 06870a6e390f68d741893b4454b8fe4063404ca8 (diff) | |
| download | nextcloud-server-b918c06be60eea9edde26b05621898627c71130d.tar.gz nextcloud-server-b918c06be60eea9edde26b05621898627c71130d.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/util.php
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions