Wxcafé (Clément Hertling) 7dfdecec73 fixes git merge shit

2015-09-03 20:14:09 +02:00

..

static

oops

2015-09-03 20:08:14 +02:00

templates

fixes git merge shit

2015-09-03 20:14:09 +02:00