Merge branch 'master' into 'tranfer_front'

Browse Source

# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html

...

This commit is contained in:

ynerant

2020-05-07 18:48:35 +02:00

parent 72642d470c 138bdbd444

commit 395c52220f

113 changed files with 10399 additions and 2120 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1197

locale/de/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff

1335

locale/fr/LC_MESSAGES/django.po

File diff suppressed because it is too large Load Diff