rgarcia ea701e9963 fixes conflicts with polls

2017-01-29 00:44:56 +01:00

..

migrate

fixes conflicts with polls

2017-01-29 00:44:56 +01:00

dev_seeds.rb

fixes conflicts with polls

2017-01-29 00:44:56 +01:00

schema.rb

fixes conflicts with polls

2017-01-29 00:44:56 +01:00

seeds.rb

Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00