nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-06-15 13:47:01 +02:00
commit 8a6706337a
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Changelog.md
View file

@ -45,6 +45,9 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
## Refactor ## Refactor
* Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085) * Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
## Bug fixes
* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)
## Features ## Features
* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090) * Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)

3
config/application.rb
View file

@ -87,6 +87,9 @@ module Diaspora
home.css home.css
color_themes/*/desktop.css color_themes/*/desktop.css
color_themes/*/mobile.css color_themes/*/mobile.css
# images from facebox gem
facebox/*
} }
# Version of your assets, change this if you want to expire all your assets # Version of your assets, change this if you want to expire all your assets