Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
- Fix unit test for album url since empty albums now have thumbnails.
Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
- Update xss_test golden file (change line numbers).
Merge pull request #120 from shadlaws/fix_1986_followon

Follow-in to 314e2e67b1d52b7d01a715d7a6680862bf83b987 for #1986.
Automated update of .build_number to 324 for branch master
Last update: a99b6f79aa8f66bc4d2ea34f814a2f53dde1d288 (1 commits ago)
Create gallery::allow_css_and_js_combining() which lets you disable combining CSS/JS
by touching var/DONT_COMBINE.  Fixes #1989.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 325 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (3 commits ago)
Merge pull request #118 from shadlaws/fix_1982_followon

Follow-on to f83ed5f8716663a45c9d8e8118bbcf0e2849c3fb for #1982.
Automated update of .build_number to 326 for branch master
Last update: 291059d86a5badb62360b88f5dccab4a07f47778 (1 commits ago)
Force a sort order no sibling checks.  Fixes #1990.
Merge branch 'master' of github.com:gallery/gallery3
Automated update of .build_number to 327 for branch master
Last update: f9aeb3b5cd4efb6bb92f034e82af93c8133df66c (5 commits ago)