Fixing migration when using postgresql
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
Updating Vagrant configuration to use new puppet config layout, and a new basebox
Updating vagrant config to use new basebox
Merge branch 'feature/vagrant-box-use-test-db' into develop
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop