Pierre-antoine Comby 68808ddece Merge branch 'master' into 'fix_distinct' ... # Conflicts: # apps/activity/views.py		2020-04-09 22:30:19 +02:00
..
api	Guests can pay with CB or coins, lot of other improvements	2020-03-28 16:52:58 +01:00
fixtures	Update permission fixtures	2020-04-06 10:45:32 +02:00
migrations	move apps to own dir	2019-08-11 14:47:44 +02:00
tests	move apps to own dir	2019-08-11 14:47:44 +02:00
__init__.py	Unify file headers	2020-02-18 21:30:26 +01:00
admin.py	Make erdnaxe be happy	2020-03-07 22:28:59 +01:00
apps.py	Unify file headers	2020-02-18 21:30:26 +01:00
forms.py	Guests can't be invited if the activity is not validated	2020-03-30 17:35:47 +02:00
models.py	Some model translations were missing	2020-04-06 10:58:16 +02:00
tables.py	Guests can pay with CB or coins, lot of other improvements	2020-03-28 16:52:58 +01:00
urls.py	Fix activity in Guest model	2020-03-27 19:16:38 +01:00
views.py	Merge branch 'master' into 'fix_distinct'	2020-04-09 22:30:19 +02:00