Jonne Haß 13029235d0 Merge branch 'stable' into develop		2015-12-13 12:28:04 +01:00
..
environments	add logfile-appender in test environment	2015-07-09 09:02:04 +02:00
initializers	Merge branch 'stable' into develop	2015-12-13 12:28:04 +01:00
locales	Merge branch 'stable' into develop	2015-12-04 06:55:41 +01:00
vines
.jshint.json	fix indentation & jshint predefines	2015-09-10 14:48:25 +02:00
.jshint_ignore	Replace jquery.autoresize with autosize	2015-06-14 20:03:15 +02:00
application.rb	Remove all faceboxes	2015-06-15 14:09:24 +02:00
asset_sync.rb
boot.rb
color_themes.yml	Issue #4297: Updated color themes and testing	2015-06-07 19:57:37 +03:00
cucumber.yml
database.yml.example	Replace DB environment variable with optional bundler groups	2015-05-29 01:33:12 +02:00
defaults.yml	start 0.5.6.0 cycle	2015-11-23 03:12:00 +01:00
diaspora.yml.example	Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm	2015-09-23 01:43:49 +02:00
environment.rb
eye.rb	Replace DB environment variable with optional bundler groups	2015-05-29 01:33:12 +02:00
load_config.rb	Load diaspora.yml overrides for test env	2015-07-24 03:47:46 +02:00
locale_settings.yml
logging.rb	make sql and federation debug-logging configurable	2015-06-09 22:55:16 +02:00
oembed_providers.yml
routes.rb	Merge branch 'stable' into develop	2015-10-09 17:47:39 +02:00
schedule.rb.example
selenium.yml
sidekiq.yml	Don't set key for logfile on Heroku	2015-10-14 11:00:42 +02:00
unicorn.rb	Add option to set a pid file for unicorn in diaspora.yml	2015-09-19 11:33:04 +02:00