Douwe Maan 8b05e8c2d1 Merge branch 'master' into diff-line-comment-vuejs ... # Conflicts: # db/schema.rb		2016-08-18 16:43:26 -05:00
..
fixtures	Update fixtures to add a created status to pipeline	2016-08-17 11:18:57 +01:00
migrate	Merge branch 'master' into diff-line-comment-vuejs	2016-08-18 16:43:26 -05:00
schema.rb	Merge branch 'master' into diff-line-comment-vuejs	2016-08-18 16:43:26 -05:00
seeds.rb