bugfix

diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh
index 1fc3672f9afce63da7426ea24aef965f3394e060..76bb465293bc2b3cad0a3fde9335e238c4b2a15c 100644 (file)
--- a/app/scripts/worker.sh
+++ b/app/scripts/worker.sh
@@ -9,8 +9,7 @@ wsgi=$app'/wsgi.py'
 # pip install django-environ redis
 
 # waiting for other services
-sh $app/scripts/w
-ait.sh
+sh $app/scripts/wait.sh
 
 # Starting celery worker with the --autoreload option will enable the worker to watch for file system changes
 # This is an experimental feature intended for use in development only

diff --git a/doc/content/ICTM2016.rst b/doc/content/ICTM2016.rst
new file mode 100644 (file)
index 0000000..359bd6a
--- /dev/null
+++ b/doc/content/ICTM2016.rst
@@ -0,0 +1,11 @@
+Telemeta at the 21st Symposium of the ICTM Study Group on Historical Sources of Traditional Music
+#######################################################################################################
+
+:category: Research
+
+Telemeta and the DIADEMS team participate to the `21st Symposium of the ICTM Study Group on Historical Sources of Traditional Music  <http://www.ictmusic.org/group/102/post/call-papers-21st-symposium-ictm-study-group-historical-sources-traditional-music>`_ (ICTM) will take place on 9-13 March 2016 in Paris, France, by invitation of Susanne Fürniss, MNHN. The conference site is the Musée de l’Homme, and the Meeting is hosted by the Musée National d'Histoire Naturelle (MNHN).
+
+Topics
+
+1. Evaluation of historical sound recordings
+2. The study of history through oral and written sources on music

diff --git a/doc/content/TM-1.6.rst b/doc/content/TM-1.6.rst
index b5e550c4b9a11308e941617423497a42d3e3e64f..47519091de96ff885636c7fc95851897b5db03cb 100644 (file)
--- a/doc/content/TM-1.6.rst
+++ b/doc/content/TM-1.6.rst
@@ -1,4 +1,4 @@
-    Telemeta 1.6 is finally out!
+Telemeta 1.6 is finally out!
 ############################
 
 :category: Releases

diff --git a/setup.py b/setup.py
index b7f4e2417e4a3ed010e8273cc795a27b1a73edaa..43d83d62a1a6b9c9b620e4f308894eb22ccdaeab 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ setup(
   long_description = open('README.rst').read(),
   author = "Guillaume Pellerin",
   author_email = "yomguy@parisson.com",
-  version = '1.6',
+  version = '1.6.1',
   install_requires = [
         'django==1.6.11',
         'django-registration==1.0',