Yohann D'ANELLO bac81cd13e Merge branch 'master' into tranfer_front ... # Conflicts: # static/js/base.js		2020-04-09 22:49:52 +02:00
..
amount_input.html	Use custom inputs for date picker and amounts	2020-03-27 13:50:02 +01:00
conso_form.html	color codes from note balances	2020-03-28 17:44:22 +01:00
transaction_form.html	Add shortcuts for transfers and credits in the activity entry page	2020-04-06 07:06:52 +02:00
transactiontemplate_form.html	Update translations	2020-03-11 12:05:29 +01:00
transactiontemplate_list.html	Comment code	2020-04-06 08:58:39 +02:00