Dennis Schubert 09aef2f145 Merge branch 'next-minor' into develop		2016-09-06 05:08:09 +02:00
..
certs	Diaspora configuration wrapper for Prosody	2016-04-25 15:30:28 +02:00
environments	Speed up asset serving in development	2016-02-16 11:19:04 +01:00
initializers	Add OpenGraph video support	2016-09-04 03:55:09 +02:00
locales	Redirect logged in users to inviters page when following an invitation link	2016-09-06 05:08:04 +02:00
application.rb	Bump to jQuery 2	2016-08-07 16:14:52 +02:00
asset_sync.rb
boot.rb
color_themes.yml	Clean up scss code for original white background	2016-01-10 00:48:30 +01:00
cucumber.yml
database.yml.example
defaults.yml	Prepare 0.7.0.0 cycle	2016-08-21 23:53:42 +02:00
diaspora.yml.example	6840 : meta tags update (#6998)	2016-08-18 21:52:39 +02:00
environment.rb
eye.rb	Diaspora configuration wrapper for Prosody	2016-04-25 15:30:28 +02:00
load_config.rb
locale_settings.yml	Update for sq translation	2015-12-27 17:49:39 +01:00
logging.rb	use DiasporaFederation::Salmon::MagicEnvelope for federation debug logging	2016-06-26 06:21:03 +02:00
oembed_providers.yml	Add media.ccc.de as trusted oEmbed endpoint	2015-12-28 16:42:34 +01:00
open_graph_providers.yml	Add OpenGraph video support	2016-09-04 03:55:09 +02:00
routes.rb	Remove user_photo method from users controller	2016-09-04 03:01:51 +02:00
schedule.rb.example
schedule.yml	fix queues for cron jobs	2016-01-28 23:46:37 +01:00
sidekiq.yml	Consolidate amount of sidekiq queues from 13 to 5	2016-08-10 08:51:22 +00:00
unicorn.rb	Add option to set a pid file for unicorn in diaspora.yml	2015-09-19 11:33:04 +02:00