Juanjo Bazán 358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

..

migrate

Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

dev_seeds.rb

updates dev_seeds.rb

2015-09-03 16:33:13 +02:00

schema.rb

Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00

seeds.rb

creates admin user in db/seeds

2015-09-02 17:25:12 +02:00