nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/config/initializers
History
Raphael 2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
..
_load_app_config.rb DG IZ; example extension convention for app_config 2010-09-22 10:59:23 -07:00
_mongo.rb Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better. 2010-09-19 16:37:34 -07:00
backtrace_silencers.rb Spell our own name right 2010-09-15 17:56:18 -07:00
carrierwave.rb Spell our own name right 2010-09-15 17:56:18 -07:00
devise.rb Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
git_info.rb added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
inflections.rb Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
locale.rb Added I18n initializer 2010-09-18 08:08:32 +08:00
logging.rb Spell our own name right 2010-09-15 17:56:18 -07:00
mime_types.rb Spell our own name right 2010-09-15 17:56:18 -07:00
rspec_generator.rb Spell our own name right 2010-09-15 17:56:18 -07:00
secret_token.rb Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
session_store.rb Spell our own name right 2010-09-15 17:56:18 -07:00