zamentur 7ef3b7523b Merge remote-tracking branch 'upstream/unstable' into unstable ... Conflicts: data/actionsmap/yunohost.yml		2015-10-02 02:57:21 +02:00
..
actionsmap	Merge remote-tracking branch 'upstream/unstable' into unstable	2015-10-02 02:57:21 +02:00
apps	[enh] Add app helpers to parse plain command output	2015-09-29 18:45:07 +02:00
hooks	[enh] Disable restore of all mysql, it will be done by apps	2015-09-30 22:27:36 +02:00
other	[fix] Replace bind9 by dnsmasq in services definition	2015-09-26 22:17:30 +02:00