diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-25 17:08:18 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-25 17:08:18 -0400 |
| commit | 30b58f56771aa54304069d40a62070c06f5308fc (patch) | |
| tree | e0bb2bba21c561f96d27bb9cfc09d714aa21d332 /apps/files_sharing/appinfo | |
| parent | 4d17ed2f71c8cbb0d34c039aa7953b2427ce5c78 (diff) | |
| parent | f25ccaff59c135d7f1f22196bf266916ef131b35 (diff) | |
| download | nextcloud-server-30b58f56771aa54304069d40a62070c06f5308fc.tar.gz nextcloud-server-30b58f56771aa54304069d40a62070c06f5308fc.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
Diffstat (limited to 'apps/files_sharing/appinfo')
| -rw-r--r-- | apps/files_sharing/appinfo/version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index 7dff5b89211..f4778493c50 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.2.1
\ No newline at end of file +0.2.2
\ No newline at end of file |