Christian Melchior 2db3ea5853 Merge branch 'master' into cm/template-method
# Conflicts:
#	CHANGELOG.md
2018-06-19 08:57:42 +02:00
..
2018-06-11 15:14:31 +02:00
2017-03-22 12:54:35 +01:00
2017-03-22 12:54:35 +01:00
2016-02-12 16:57:13 -08:00
2018-06-07 11:25:38 +02:00
2017-07-11 13:33:38 +02:00
2018-05-17 11:51:45 +02:00
2018-05-17 11:51:45 +02:00
2018-06-11 15:14:31 +02:00
2018-05-17 11:51:45 +02:00
2018-06-11 15:14:31 +02:00