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 Delande 98ea1c8873 Merge remote-tracking branch 'upstream/master'
Conflicts:
	conf/nginx.conf
	sources/budget/run.py
	sources/budget/utils.py
2016-06-17 23:40:38 +02:00
..
migrations Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
static Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
templates Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
translations/fr/LC_MESSAGES Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02: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 Imperted upstream code at 42dd9d54a8 (upstream is not tagged) inside a the sources dir 2015-04-26 14:06:33 +02: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 remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02: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 remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
requirements.txt Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
run.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
tests.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
utils.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00
web.py Merge remote-tracking branch 'upstream/master' 2016-06-17 23:40:38 +02:00