diff options
| author | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-29 21:49:43 -0700 |
| commit | c4221f32738dac51f691d5be1bebd2b50318521e (patch) | |
| tree | e353242b42ca2942d7fe6d29888568c8bfe821ee /view/js | |
| parent | 6679734135fb04f4a7beccb81663bf1e9574f062 (diff) | |
| parent | 2376d2140ab6eeb8a44d7582a52978520844e229 (diff) | |
| download | volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.gz volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.tar.bz2 volse-hubzilla-c4221f32738dac51f691d5be1bebd2b50318521e.zip | |
Merge branch 'master' into tres
Conflicts:
include/notifier.php
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index d1e61dc24..35944e13f 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -743,7 +743,6 @@ function justifyPhotos() { $('#photo-album-contents').justifiedGallery({ margins: 3, border: 0, - ignoreElement: '#page-end', sizeRangeSuffixes: { 'lt100': '-2', 'lt240': '-2', |