Benjamin Neff f5fc142f63 Merge branch 'next-minor' into develop		2017-08-19 18:26:14 +02:00
..
certs
environments
initializers
locales
application.rb
asset_sync.rb
boot.rb
color_themes.yml
cucumber.yml
database.yml.example
defaults.yml
diaspora.yml.example
environment.rb
eye.rb
load_config.rb
locale_settings.yml
logging.rb
oembed_providers.yml
open_graph_providers.yml
routes.rb
schedule.rb.example
schedule.yml
sidekiq.yml
spring.rb
unicorn.rb