Xeniac
3a3c8ec0c5
Merge branch 'master' into css3_redesign
# Conflicts:
# requirements/base.txt
# src/content/locale/de/LC_MESSAGES/django.mo
# src/content/locale/de/LC_MESSAGES/django.po
# src/events/locale/de/LC_MESSAGES/django.mo
# src/events/locale/de/LC_MESSAGES/django.po
# src/kasu/locale/de/LC_MESSAGES/django.po
# src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo
# src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
# src/maistar_ranking/locale/de/LC_MESSAGES/django.po
# src/membership/locale/de/LC_MESSAGES/django.mo
# src/membership/locale/de/LC_MESSAGES/django.po
# src/utils/locale/de/LC_MESSAGES/django.po
2018-04-30 08:29:14 +02:00
..
2018-04-27 10:10:02 +02:00
2017-12-29 10:03:08 +01:00
2017-09-08 07:51:07 +02:00