James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

collection_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

file_sample_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

line_profiler_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

line_sample_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

location_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

middleware_spec.rb

Tag lib specs

2015-12-09 11:55:42 +01:00

query_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

transaction_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00