Alejandro Celaya 781ca39938 Fixed merge conflicts

2017-10-23 13:28:09 +02:00

..

config

Fixed merge conflicts

2017-10-23 13:28:09 +02:00

lang

Added new translations

2017-10-13 12:30:54 +02:00

src

Fixed merge conflicts

2017-10-23 13:28:09 +02:00

templates

Ensured a generic template is used to render generic 404 errors, and a more specific one to render 'invalid short url' errors

2017-10-13 12:22:19 +02:00

test

Fixed merge conflicts

2017-10-23 13:28:09 +02:00

test-func/Repository

Improved ShortUrlRepositoryTest

2017-10-23 13:06:29 +02:00