Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Don't pin D3js version anymore

Roland Geiderc5aaf4bb51b3
diff --git a/docs/changelog.rst b/docs/changelog.rst
index f9a2a2a29..1a3c9f352 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -39,7 +39,7 @@ Improvements:
* Remove hard-coded CC licence from documentation and website `#247`_
Other improvements and bugfixes: `#25`_, `#243`_, `#279`_, `#275`_, `#270`_, `#258`_, `#257`_,
-`#263`_, `#269`_, `#296`_, `#297`_, `#303`_
+`#263`_, `#269`_, `#296`_, `#297`_, `#302`_, `#303`_, `#311`_,
.. _#25: https://github.com/wger-project/wger/issues/25
@@ -63,8 +63,10 @@ Other improvements and bugfixes: `#25`_, `#243`_, `#279`_, `#275`_, `#270`_, `#2
.. _#293: https://github.com/wger-project/wger/issues/293
.. _#296: https://github.com/wger-project/wger/issues/296
.. _#297: https://github.com/wger-project/wger/issues/297
+.. _#302: https://github.com/wger-project/wger/issues/302
.. _#303: https://github.com/wger-project/wger/issues/303
.. _#304: https://github.com/wger-project/wger/issues/304
+.. _#311: https://github.com/wger-project/wger/issues/311
.. _@alelevinas: https://github.com/alelevinas
.. _@jstoebel: https://github.com/jstoebel
.. _@alokhan: https://github.com/alokhan
diff --git a/wger/settings_global.py b/wger/settings_global.py
index d72ff4131..728ad03b6 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -93,7 +93,7 @@ INSTALLED_APPS = (
BOWER_INSTALLED_APPS = (
'jquery#2.1.x',
'bootstrap',
- 'd3#3.x',
+ 'd3',
'shariff',
'tinymce-dist',
'DataTables',