Miles Gould 20eeec43ca Merge branch 'dev' into photos ...

Conflicts:
	db/schema.rb

2013-05-31 11:24:19 +01:00

..

images

Added flickr icon, updated twitter icon

2013-05-14 22:33:55 +10:00

javascripts

rails g scaffold Photo...

2013-05-08 20:52:35 +10:00

stylesheets

Tried to use Bootstrap datepicker. Failed!

2013-03-26 19:27:45 +11:00