rgarcia c9e46e3d8f fixes conflicts

2015-09-14 16:46:00 +02:00

..

migrate

fixes conflicts

2015-09-14 16:46:00 +02:00

dev_seeds.rb

moves magic number to Settings

2015-09-14 13:37:16 +02:00

schema.rb

fixes conflicts

2015-09-14 16:46:00 +02:00

seeds.rb

moves magic number to Settings

2015-09-14 13:37:16 +02:00