Merge branch 'martin-t/campaign' into 'master'
authorMirio <opivy@hotmail.de>
Wed, 1 Feb 2017 18:23:53 +0000 (18:23 +0000)
committerMirio <opivy@hotmail.de>
Wed, 1 Feb 2017 18:23:53 +0000 (18:23 +0000)
commit166857996eeef3e5cea39f446fc7115e59270fb7
tree9414c628f5bc31034b50c58708a7a2acc6056c2b
parentc0c3ee0747bf1c8ef9c1fc9b0a8e352700ff5a18
parent4898211c52e3377973c1af49eea6d3f83bca8cb8
Merge branch 'martin-t/campaign' into 'master'

Campaign description tweaks

See merge request !60