gurix 8cb8aea9ca Merge branch 'master' into features/publicity ...

# Conflicts:
#	.gitignore

2017-04-18 16:22:36 +02:00

..

confirmations

Translations, design and content

2017-03-31 14:42:37 +02:00

mailer

Translations, design and content

2017-03-31 14:42:37 +02:00

passwords

Translations, design and content

2017-03-31 14:42:37 +02:00

registrations

Remove mailchimp and add sendy

2017-04-18 14:41:35 +02:00

sessions

fixed translation

2017-03-31 16:28:57 +02:00

shared

Translations, design and content

2017-03-31 14:42:37 +02:00

unlocks

Translations, design and content

2017-03-31 14:42:37 +02:00

_form.slim

Navigation

2017-03-22 22:57:01 +01:00

_publicity.slim

Manage publicities

2017-04-14 11:34:01 +02:00

_right_side.de.slim

added footer

2017-04-11 11:24:19 +02:00

_right_side.fr.slim

added footer

2017-04-11 11:24:19 +02:00

_right_side.it.slim

added footer

2017-04-11 11:24:19 +02:00

new.slim

Merge branch 'master' into features/publicity

2017-04-18 16:22:36 +02:00