Merge remote-tracking branch 'upstream/develop' into develop
authorMichael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 1 Aug 2016 06:02:26 +0000 (08:02 +0200)
commit02b5f6a34d8589c8920ff28351ecd231d8b1204e
treeab9406a82048fa4a34eea2543e39e2e21e05db19
parent668da905e2b3a096ed5b5059cbaec587fa113d23
parent75be187216255c7c45421cb5f9596118a954f878
Merge remote-tracking branch 'upstream/develop' into develop
boot.php
include/Contact.php
update.php