From: Philipp Dallig <philipp.dallig@publicispixelpark.de>
Date: Thu, 24 Nov 2016 09:01:34 +0000 (+0100)
Subject: Merge branch 'patch-19' into 'master'
X-Git-Tag: v0.1.0~3778
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=dd494226b83d0c50730912978f901a8721c6f241;p=pixelpark%2Fhiera.git

Merge branch 'patch-19' into 'master'

Higher memory_limit for test-web01-sgb2-info.pixelpark.net

See merge request !95
---

dd494226b83d0c50730912978f901a8721c6f241