YunoHost-Apps/ihatemoney_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
Code Issues Activity Actions
390 commits 2 branches 0 tags 1.4 MiB
Commit graph

3 commits

Author SHA1 Message Date
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
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
Jocelyn Delande
3192681226 Imperted upstream code at 42dd9d54a8 (upstream is not tagged) inside a the sources dir 2015-04-26 14:06:33 +02:00