search

Parisson / Telemeta

Collaborative content management system for musicology
http://telemeta.org
GNU Affero General Public License v3.0
118 stars 38 forks source link

Merge master into Dev #191

Closed thomasfillon closed 7 years ago

thomasfillon commented 7 years ago

@yomguy There are some commits in master that probably need to be merged in dev. As far as I understand, it seems ok but I let you check.

We need to clean-up and homogenize all the branches before moving to Django 1.8 soon.

yomguy commented 7 years ago

All is right, merged. Thanks for the info !

yomguy commented 7 years ago

Unfortunately, I need to hack the enumeration management coded recently before the new release.