1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
Commit graph

4 commits

Author SHA1 Message Date
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
3472a64776 Merge branch 'ynh-patched-upstream'
Including mysql fixes
2015-05-01 23:30:16 +02:00
Jocelyn Delande
4037139ac8 Merge branch 'ynh-patched' of github.com:JocelynDelalande/ihatemoney into ynh-pathed-upstream
Waiting for pull requests to be included upstream.
2015-05-01 14:35:25 +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