Will Marshall a87361d82e Merge branch 'master' into maps ...

Conflicts:
	app/assets/javascripts/darkswarm/services/map.js.coffee
	app/assets/javascripts/templates/map_modal.html.haml
	app/views/layouts/darkswarm.html.haml
	app/views/map/index.html.haml
	app/views/shared/menu/_large_menu.html.haml
	config/routes.rb

2014-06-06 17:21:27 +10:00

..

environments

Forcing everything to be SSL

2014-05-14 15:55:19 +10:00

initializers

Starting on on the map

2014-06-06 14:04:45 +10:00

locales

Rename 'Home' link to 'OFN'

2013-09-11 15:13:45 +10:00

application.rb

Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230

2014-05-09 16:39:39 +10:00

boot.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

database.travis.yml

Rename database names and user name

2013-10-19 09:43:10 +11:00

database.yml

Starting to prettify with Laura

2014-04-22 15:46:14 +10:00

environment.rb

Rename application from Openfoodweb to Openfoodnetwork

2013-10-18 17:32:22 +11:00

ng-test.conf.js

Create angularjs admin module

2014-05-02 15:56:20 +10:00

routes.rb

Merge branch 'master' into maps

2014-06-06 17:21:27 +10:00

spree.yml

spree install.

2012-03-27 11:06:49 +11:00

unicorn.rb

Increase unicorn timeout so that reports can run over long date range.

2013-05-05 18:42:42 +10:00