nk20/apps
Yohann D'ANELLO bac81cd13e Merge branch 'master' into tranfer_front
# Conflicts:
#	static/js/base.js
2020-04-09 22:49:52 +02:00
..
activity Merge branch 'explicit>implicit' into 'master' 2020-04-09 22:41:04 +02:00
api API Support (useless, but...) 2020-03-22 16:04:09 +01:00
logs Some model translations were missing 2020-04-06 10:58:16 +02:00
member Update mail translation 2020-04-09 22:03:26 +02:00
note Merge branch 'master' into tranfer_front 2020-04-09 22:49:52 +02:00
permission Merge branch 'master' into 'fix_distinct' 2020-04-09 22:30:19 +02:00
registration Update mail translation 2020-04-09 22:03:26 +02:00
scripts@b9fdced3c2 Refactor and comment noteView 2020-03-23 15:28:09 +01:00
treasury Merge branch 'master' into 'explicit>implicit' 2020-04-09 22:31:54 +02:00