rgarcia f24a8887bb fixes conflicts with master

2016-07-19 14:49:27 +02:00

..

migrate

fixes conflicts with master

2016-07-19 14:49:27 +02:00

dev_seeds.rb

fixes conflicts with master

2016-07-19 14:49:27 +02:00

schema.rb

fixes conflicts with master

2016-07-19 14:49:27 +02:00

seeds.rb

Change madrid.es to consul.dev - closes #1169

2016-07-14 16:28:16 +02:00