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
..
test.yml	Add support for Authenticators in the API	2014-03-22 17:01:30 +01:00
yunohost.yml	Merge remote-tracking branch 'upstream/dev' into test	2014-03-26 02:11:20 +01:00