diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-28 23:21:26 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-28 23:21:26 +0200 |
| commit | 0ba498119ca2cdc0705b3ede5adf1dda9073d2ea (patch) | |
| tree | 12f6559012f435e18b836848cecab2a05235a064 /settings | |
| parent | bdf48a6daa8234b307bb7b73a231de5227e10b30 (diff) | |
| parent | cebb635955c71895545ce7ff5bad7808b1e22c0e (diff) | |
| download | nextcloud-server-0ba498119ca2cdc0705b3ede5adf1dda9073d2ea.tar.gz nextcloud-server-0ba498119ca2cdc0705b3ede5adf1dda9073d2ea.zip | |
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
Diffstat (limited to 'settings')
0 files changed, 0 insertions, 0 deletions