Merge branch 'testing' into version-2

README.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 

README_fr.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 

conf/nginx.conf

@@ -32,4 +32,3 @@ location __PATH__/ {
 location @bicbucstriim {
     rewrite /(.*)$ /index.php?/$1 last;
 }
-

manifest.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2
 
 id = "bicbucstriim"
@@ -42,7 +44,6 @@ ram.runtime = "50M"
     [resources.sources.main]
     url = "https://github.com/mikespub-org/rvolz-BicBucStriim/releases/download/v1.6.5/bicbucstriim-1.6.5.zip"
     sha256 = "8cd516fd25253a0aee2c047706164686f175fd23730462eb424196d0bb102b35"
-        in_subdir = false
 
     [resources.system_user]
 

scripts/_common.sh

@@ -4,6 +4,14 @@
 # COMMON VARIABLES
 #=================================================
 
+<<<<<<< HEAD
+=======
+YNH_PHP_VERSION="7.4"
+
+pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mbstring"
+#php${YNH_PHP_VERSION}-mcrypt
+
+>>>>>>> testing
 #=================================================
 # PERSONAL HELPERS
 #=================================================

tests.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json
+
 test_format = 1.0
 
 [default]