Juanjo Bazán b8b71d0ab0 Merge branch 'master' into budget

2016-09-02 12:47:54 +02:00

..

migrate

Merge branch 'master' into budget

2016-09-02 12:47:54 +02:00

dev_seeds.rb

fixes conflicts with master

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

schema.rb

Merge branch 'master' into budget

2016-09-02 12:47:54 +02:00

seeds.rb

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

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