diaspora/config
danielgrippi 7eaca0346c Merge branch 'master' into follow
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
..
deploy Make cap deploy follow a branch in deploy_config.yml 2011-02-09 16:07:24 -08:00
environments Fix crazy slow dev-mode exception pages using targeted .inspect monkeypatches 2011-04-06 17:45:52 -07:00
initializers Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
locales Merge branch 'master' into follow 2011-05-16 14:56:28 -07:00
app_config.yml.example For the love of god, normal Rails logs in test & development. 2011-05-14 13:29:54 -07:00
application.rb For the love of god, normal Rails logs in test & development. 2011-05-14 13:29:54 -07:00
assets.yml Merge branch 'master' into follow 2011-05-16 14:56:28 -07:00
boot.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
cucumber.yml suburi cucumber test. 2010-12-29 10:31:25 +01:00
database.yml.example improved database.yml.example 2011-04-30 00:56:35 +02:00
deploy.rb Restore deploy.rb 2011-05-13 16:35:55 -07:00
deploy_config.yml.example Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
environment.rb fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
locale_settings.yml added arabic 2011-05-08 01:02:33 +02:00
oauth_keys.yml.example changed back consumer_token to consumer_key as its not only more consistent with twitters website it also causes less support (less users complaining that their twitter integration is broken) :) 2010-12-03 16:04:37 +01:00
redis.yml Revert "Revert redis merge to fix bugs on master" 2010-12-02 15:33:26 -08:00
routes.rb Merge branch 'master' into follow 2011-05-12 15:49:51 -07:00
selenium.yml Add or later to license notice 2010-10-07 16:25:34 -07:00
server.sh removed RAILS_ENV=test example from config/server.sh 2011-03-01 17:28:35 +01:00
thin.yml Add or later to license notice 2010-10-07 16:25:34 -07:00