5 Commits

Author SHA1 Message Date
Denis Rouzaud
ce109eac98
Revert "use second Dockerfile to push 2nd image"
This reverts commit 050682a37364e110f350b9c3293f662b0011036d.
2017-09-28 13:22:30 +02:00
Denis Rouzaud
71042b979f
# This is a combination of 5 commits.
# The first commit's message is:
some fixes

# The 2nd commit message will be skipped:

#	more fixes

# The 3rd commit message will be skipped:

#	minor fixes

# The 4th commit message will be skipped:

#	Revert "minor fixes"
#
#	This reverts commit 24c3ae15e04bc928b1c59d059d5378ad30bd6008.

# The 5th commit message will be skipped:

#	Revert "more fixes"
#
#	This reverts commit 1d3c4d97cf6ecd81f27ca43889132b5ba1bdd1ad.
2017-09-28 13:18:29 +02:00
Denis Rouzaud
7a2e0892e6
use second Dockerfile to push 2nd image 2017-09-28 13:18:27 +02:00
Denis Rouzaud
a0add1774e
use docker for newer dependencies on Travis 2017-09-28 13:18:18 +02:00
Matthias Kuhn
c28e344853 Move ci to .ci 2017-04-27 07:50:06 +02:00