diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-11 20:25:59 -0400 |
| commit | 4bf13adff25f012c735931c0578b1f5d0790bdbe (patch) | |
| tree | a7c5451ff25e2f39936ae984ceb5b3b9eb519088 /apps/gallery/templates/view_album.php | |
| parent | 88f4845ca33fd6f2988f230116e2190d15ab1866 (diff) | |
| parent | 8890a4128015df0ad57101703d6c164ea54fe4ee (diff) | |
| download | nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.tar.gz nextcloud-server-4bf13adff25f012c735931c0578b1f5d0790bdbe.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
Diffstat (limited to 'apps/gallery/templates/view_album.php')
| -rw-r--r-- | apps/gallery/templates/view_album.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php index c16ed69c065..00e891103f1 100644 --- a/apps/gallery/templates/view_album.php +++ b/apps/gallery/templates/view_album.php @@ -1,9 +1,9 @@ <?php OCP\Util::addStyle('gallery', 'styles'); -OCP\Util::addscript('gallery', 'albums'); -OCP\Util::addscript('gallery', 'album_cover'); -OCP\Util::addscript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack'); -OCP\Util::addscript('files_imageviewer', 'jquery.fancybox-1.3.4.pack'); +OCP\Util::addScript('gallery', 'albums'); +OCP\Util::addScript('gallery', 'album_cover'); +OCP\Util::addScript('files_imageviewer', 'jquery.mousewheel-3.0.4.pack'); +OCP\Util::addScript('files_imageviewer', 'jquery.fancybox-1.3.4.pack'); OCP\Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' ); $l = OC_L10N::get('gallery'); ?> |