scinote-web/db
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4'
Conflicts:
	Gemfile.lock
2017-12-19 10:56:39 +01:00
..
migrate Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
load_users_template.yml rename organizations in test/ 2017-01-25 13:56:43 +01:00
schema.rb Merge branch 'gilson-iot-rails4' 2017-12-19 10:56:39 +01:00
seeds.rb fixes hound 2017-01-31 13:33:55 +01:00