Hans Cornelis ef55ca525c Deleted conflicting merge files ...

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>

2018-10-17 07:48:52 +02:00

..

admin

Merge pull request #647 from HorayNarea/bcrypt

2018-10-16 17:50:44 +00:00

dovecot

Deleted conflicting merge files

2018-10-17 07:48:52 +02:00

nginx

Merged conflicts

2018-10-17 07:32:56 +02:00

none

pin alpine-version for 'none'-image

2018-10-11 03:20:19 +02:00

postfix

Merged conflicts

2018-10-17 07:32:56 +02:00