Jerome Lebleu 85071f9309 Merge remote-tracking branch 'upstream/dev' into test ... Conflicts: data/actionsmap/yunohost.yml lib/yunohost/firewall.py lib/yunohost/tools.py		2014-03-26 02:11:20 +01:00
..
actionsmap	Merge remote-tracking branch 'upstream/dev' into test	2014-03-26 02:11:20 +01:00
moulinette_cli	Rename 'etc' folder and move yunohost into a separate package	2014-02-24 19:11:09 +01:00