Kamil Trzcinski 006b650988 Merge remote-tracking branch 'origin/master' into environments-and-deployments ... # Conflicts: # db/schema.rb		2016-06-14 16:19:29 +02:00
..
build/artifacts	Enable Style/WhileUntilDo rubocop style cop	2016-05-30 11:37:14 +02:00
config	Merge remote-tracking branch 'origin/master' into environments-and-deployments	2016-06-14 16:19:29 +02:00
config.rb	Add comments to new CI config classes and modules	2016-06-09 13:15:54 +02:00