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

# Conflicts:
#	app/models/project.rb

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

..

assets

Fix merge conflicts - squashed commit

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

controllers

Fix merge conflicts - squashed commit

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

finders

Fix merge conflicts - squashed commit

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

helpers

Fix merge conflicts - squashed commit

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

mailers

Fix merge conflicts - squashed commit

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

models

Fix merge conflicts - squashed commit

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

services

Fix merge conflicts - squashed commit

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

uploaders

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

validators

Allow webhooks URL to have leading and trailing spaces

2016-02-26 14:34:06 -05:00

views

Fix merge conflicts - squashed commit

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

workers

Fix merge conflicts - squashed commit

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