diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-22 23:06:53 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-22 23:06:53 +0200 |
| commit | 9019ad550fc4c8e6d636eaaf98062ba2e495d135 (patch) | |
| tree | 92b0e3e7e34dd1a5497fc2f62b30085af41317cd /core/templates/message.html | |
| parent | ca3771f8fd761a51ea7bbe123dcb16c5da7f4045 (diff) | |
| parent | d2fa0f5ff208dc5e043109a8d08b58bf344d24b3 (diff) | |
| download | nextcloud-server-9019ad550fc4c8e6d636eaaf98062ba2e495d135.tar.gz nextcloud-server-9019ad550fc4c8e6d636eaaf98062ba2e495d135.zip | |
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
Conflicts:
apps/files/js/filelist.js
Diffstat (limited to 'core/templates/message.html')
0 files changed, 0 insertions, 0 deletions