zamentur ea5ffb8498 Merge remote-tracking branch 'upstream/unstable' into unstable ... Conflicts: data/hooks/restore/05-conf_ldap		2016-02-08 22:52:28 +01:00
..
actionsmap	[mod] typo	2016-01-26 15:50:05 +00:00
apps	[enh] Add a ynh_app_setting_delete helper	2016-01-19 18:50:00 +01:00
bash-completion.d	[enh] Add bash completion for bin/yunohost	2015-11-13 13:21:30 +01:00
hooks	Merge remote-tracking branch 'upstream/unstable' into unstable	2016-02-08 22:52:28 +01:00
other	[enh] Make postinstall and main domain change regen-conf friendly	2015-10-01 16:36:30 -04:00
templates	[fix] head opening tag may have attributes.	2016-02-08 12:33:34 +01:00