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

Conflicts:
	db/schema.rb

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

..

migrate

Merge branch 'dev' into photos

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

seeds

Fixed tests by getting rid of valid_session

2012-11-26 19:04:43 +11:00

schema.rb

Merge branch 'dev' into photos

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

seeds.rb

create admin and wrangler users in dev environment

2013-05-02 11:18:46 +10:00