diff options
author | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
commit | 6b061c236dd5730837b567f2c39a19af1617d33c (patch) | |
tree | 27de0d46deae2987ea398f2f2aee4e26786c6f48 /apps/files_versions/js | |
parent | 8951328a87c16e5ebfe4d3e5c392347db1e54f92 (diff) | |
parent | ab696edba685cd6d2a64c2e48907f03197aae53f (diff) | |
download | nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.tar.gz nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.zip |
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Diffstat (limited to 'apps/files_versions/js')
-rw-r--r-- | apps/files_versions/js/versions.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index 4adf14745de..b452bc25b13 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -11,7 +11,7 @@ $(document).ready(function(){ // Add versions button to 'files/index.php' FileActions.register( 'file' - , t('files_versions', 'Versions') + , 'Versions' , OC.PERMISSION_UPDATE , function() { // Specify icon for hitory button @@ -36,6 +36,7 @@ $(document).ready(function(){ createVersionsDropdown(filename, file); } } + , t('files_versions', 'Versions') ); } |