Commit Graph

5 Commits

Author SHA1 Message Date
Miles Gould
4701bd1b2e Merge branch 'dev' into places2
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
2013-08-31 15:49:30 +01:00
Skud
f747db7518 newsletter subscription/unsubscription via Mailchimp API 2013-08-27 22:45:18 +10:00
Ryan Clark
fe00146f22 Added map to places/index 2013-08-06 19:38:11 -07:00
Skud
df1cded83c added flickr key/secret 2013-04-30 22:10:05 +10:00
Skud
c56666e68f added credentials.example 2013-04-30 10:11:22 +10:00