moulinette/lib/yunohost/data
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
..
checkupdate Merge remote-tracking branch 'upstream/dev' into test 2014-03-26 02:11:20 +01:00
firewall.yml Try to improve time execution and continue refactoring 2014-03-11 00:57:28 +01:00
ldap_scheme.yml Try to improve time execution and continue refactoring 2014-03-11 00:57:28 +01:00
services.yml Merge remote-tracking branch 'upstream/dev' into test 2014-03-26 02:11:20 +01:00
upgrade Merge remote-tracking branch 'upstream/dev' into test 2014-03-26 02:11:20 +01:00