Merge branch 'master' into modify_level

Conflicts:
	community.json
This commit is contained in:
Laurent Peuch
2017-01-30 23:50:16 +01:00
2 changed files with 48 additions and 2 deletions

View File

@ -255,6 +255,12 @@
"state": "inprogress",
"url": "https://github.com/matlink/gitweb_ynh"
},
"glowingbear": {
"branch": "master",
"revision": "b799d63e67307abdfe6ccf94979d4b25ac642d2d",
"state": "working",
"url": "https://github.com/jodeko/glowing_bear_ynh"
},
"glpi": {
"branch": "master",
"revision": "5982ac51159d42cef1c969b479346d6bc95abba5",
@ -274,6 +280,12 @@
"state": "working",
"url": "https://github.com/YunoHost-Apps/gogs_ynh"
},
"headphones": {
"branch": "master",
"revision": "8f2a891a987dff486d190032cef4352e7f3d8796",
"state": "working",
"url": "https://github.com/YunoHost-Apps/headphones_ynh"
},
"hotspot": {
"branch": "master",
"revision": "850f19584efe0764642587bb49ba47e73415be6b",
@ -569,8 +581,7 @@
},
"piwigo": {
"branch": "master",
"level": 3,
"revision": "77f8bbda34bf7ce588ad502530e04eb77d832077",
"revision": "4adda14d459492fd474a5f139ede2728483c0e28",
"state": "working",
"url": "https://github.com/YunoHost-Apps/piwigo_ynh"
},