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
..
node	Merge remote-tracking branch 'origin/master' into environments-and-deployments	2016-06-14 16:19:29 +02:00
loader.rb	Improve Ci config loader by changing method signature	2016-06-07 12:53:46 +02:00