diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-28 16:44:11 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-28 16:44:11 +0200 |
| commit | 67c5be9f199c08ac4c9307901e8e6cc678943f05 (patch) | |
| tree | 061575d844745b3ad43b9aac518b386228966ad3 /core/avatar | |
| parent | 8d8a57de7fb41030ffb69f098419616f4003119a (diff) | |
| parent | 0c02e1efef76430eea8986697cd9736814fb604a (diff) | |
| download | nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.tar.gz nextcloud-server-67c5be9f199c08ac4c9307901e8e6cc678943f05.zip | |
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
Diffstat (limited to 'core/avatar')
0 files changed, 0 insertions, 0 deletions