scinote-web/db
Luka Murn cf291bf887 Merge branch 'gilson-iot-rails4'
Conflicts:
	Gemfile.lock
2017-12-19 10:56:39 +01:00
..
migrate
load_users_template.yml
schema.rb Merge branch 'gilson-iot-rails4' 2017-12-19 10:56:39 +01:00
seeds.rb