Jonne Haß 4c750c8784 Merge branch 'master' into stable		2016-06-07 14:04:22 +02:00
..
environments	Speed up asset serving in development	2016-02-16 11:19:04 +01:00
initializers	Set ca_file explicitly for the mail gem too	2016-06-07 13:11:32 +02:00
locales	updated 73 locale files [ci skip]	2016-05-21 19:00:35 +02:00
vines
.jshint.json	Update javascript styleguide	2015-04-01 01:24:11 +02:00
.jshint_ignore	Use jshintrb and guard-jshintrb instead of jshint	2015-03-18 10:49:17 +01:00
application.rb	precompile images from facebox gem	2015-06-15 13:46:07 +02:00
asset_sync.rb
boot.rb
cucumber.yml
database.yml.example
defaults.yml	Merge branch 'master' into stable	2016-06-07 14:04:22 +02:00
diaspora.yml.example	OpenSSL verification modes other than none and peer make no sense for	2016-06-07 12:29:21 +02:00
environment.rb
eye.rb	split eye output in 2 logfiles and forward stdout to terminal in dev mode	2015-05-26 03:06:42 +02:00
load_config.rb	Load diaspora.yml overrides for test env	2015-07-24 03:47:46 +02:00
locale_settings.yml	Update for sq translation	2015-12-27 17:49:39 +01:00
logging.rb	make sql and federation debug-logging configurable	2015-06-09 22:55:16 +02:00
oembed_providers.yml	Add media.ccc.de as trusted oEmbed endpoint	2015-12-28 16:42:34 +01:00
routes.rb	remove PublicsController completely	2015-12-30 14:50:34 +01: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