James Lopez b3a0a1c315 fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

..

assets

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

controllers

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

finders

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

helpers

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

mailers

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

models

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

services

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +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

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00

workers

fixed merge conflicts on UI branch

2016-06-16 15:01:27 +02:00