Miles Gould 4701bd1b2e Merge branch 'dev' into places2 ...

Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example

2013-08-31 15:49:30 +01:00

..

deploy

More tweaks to get staging working

2012-10-06 21:48:59 +01:00

environments

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

initializers

Set User-Agent in Geocoder requests; delete custom nominatim lib.

2013-08-28 12:08:19 +01:00

locales

prettified seed-related views

2013-07-15 22:53:30 +10:00

application.rb

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

boot.rb

Moving development to top level directory

2012-08-23 10:41:00 -07:00

compass.rb

i think i've got foundation working. maybe.

2012-09-15 11:12:04 +01:00

database.yml

fixed c&p error in database.yml

2013-07-08 11:05:46 +10:00

deploy.rb

missed a comma

2012-10-06 21:37:14 +01:00

environment.rb

Moving development to top level directory

2012-08-23 10:41:00 -07:00

newrelic.yml

setting up NewRelic for performance monitoring

2013-03-19 15:22:59 +11:00

routes.rb

Merge branch 'dev' into places2

2013-08-31 15:49:30 +01:00

setup_load_paths.rb

removing line i previously commented out at passenger's suggestion

2012-09-12 09:48:39 +01:00

unicorn.rb

Use unicorn for concurrency on heroku

2013-03-19 14:10:06 +11:00