1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
ihatemoney_ynh/sources/budget
Jocelyn Delalande 2b3b63ef27 Merge branch 'upstream'
Conflicts:
	sources/budget/static/css/datepicker.css
	sources/budget/static/js/jquery-1.7.2.min.js
2017-03-18 17:58:12 +01:00
..
migrations Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
static Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
templates Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
translations/fr/LC_MESSAGES Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
__init__.py Imperted upstream code at 42dd9d54a8 (upstream is not tagged) inside a the sources dir 2015-04-26 14:06:33 +02:00
api.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
babel.cfg Imperted upstream code at 42dd9d54a8 (upstream is not tagged) inside a the sources dir 2015-04-26 14:06:33 +02:00
default_settings.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
forms.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
manage.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
merged_settings.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
messages.pot Imperted upstream code at 42dd9d54a8 (upstream is not tagged) inside a the sources dir 2015-04-26 14:06:33 +02:00
models.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
requirements.txt Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
run.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
tests.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
utils.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00
web.py Merge branch 'upstream' 2017-03-18 17:58:12 +01:00