git.99rst.org / roundcube-roundcubemail-docker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e619d80 a8fe345)
Merge pull request #4 from madmath03/master
authorThomas B <redacted>
Thu, 12 Apr 2018 20:47:22 +0000 (22:47 +0200)
committerGitHub <redacted>
Thu, 12 Apr 2018 20:47:22 +0000 (22:47 +0200)
Added basic Travis CI and fix deprecated maintainer label

1  2 
php-apache/Dockerfile patch | diff1 | diff2 | blob | history
php-fpm/Dockerfile patch | diff1 | diff2 | blob | history

diff --cc php-apache/Dockerfile
Simple merge
diff --cc php-fpm/Dockerfile
Simple merge
git clone https://git.99rst.org/PROJECT