From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 29 Jun 2021 00:27:19 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 2.1~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ecf0c6264b1c4926928a102fe14934c0972f507a;p=teleforma.git

Merge branch 'dev'
---

ecf0c6264b1c4926928a102fe14934c0972f507a
diff --cc app/wsgi.sh
index 847389f9,ca4238f8..90c7eb97
--- a/app/wsgi.sh
+++ b/app/wsgi.sh
@@@ -9,14 -9,6 +9,17 @@@ src='/srv/src/
  uwsgi_log='/var/log/uwsgi/app.log'
  debug_log='/var/log/app/debug.log'
  
++<<<<<<< HEAD
 +# uwsgi params
 +port=8000
 +processes=32
 +http_timeout=120
 +#threads=2
 +autoreload=3
 +uid='www-data'
 +gid='www-data'
++=======
++>>>>>>> dev
  # patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2'
  
  # Install a package in development mode