MrZYX 98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections ... Conflicts: Gemfile app/controllers/application_controller.rb app/controllers/posts_controller.rb app/controllers/publics_controller.rb		2011-02-24 00:33:34 +01:00
..
deploy	Make cap deploy follow a branch in deploy_config.yml	2011-02-09 16:07:24 -08:00
environments	Add logging for GC (slight slowdown, but worth it for the data)	2011-02-10 15:52:00 -08:00
initializers	total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit	2011-02-21 17:13:11 +01:00
locales	Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections	2011-02-24 00:33:34 +01:00
app_config.yml.example	document s3 in app_config.yml.example	2011-02-09 17:42:21 -08:00
application.rb	Use a fake to not allocate an AR model for every reference to a person	2011-01-24 15:13:52 -08:00
assets.yml	load jquery from google only if local copy fails	2011-02-22 13:41:05 -06:00
boot.rb
cucumber.yml
database.yml.example	replaced user with username in the database.yml example	2011-01-20 15:19:14 +01:00
deploy.rb	use capture and captures to detect thins in /service	2011-01-31 15:28:43 -08: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	collapsed langcodes_alias_map.yml and languages.yml into locale_settings.yml	2011-02-20 14:35:24 +01:00
locale_settings.yml	fixed sort by css for languages different from english	2011-02-20 19:00:13 +01:00
oauth_keys.yml.example
redis.yml
routes.rb	MS IZ added spec from admin page, moved it to its own controller where it belongs	2011-02-18 11:35:24 -08:00
selenium.yml
server.sh
thin.yml