# HG changeset patch # User cavaliet # Date 1368613104 -7200 # Node ID c0a7d3cee89f9df085bb7dd54e4d6c6dd9cbc7e2 # Parent f305d9a7d0b11908a50a07315e51d070ed8ea5b6 correct merge for audio record annotation and update version number to 1.49.2 diff -r f305d9a7d0b1 -r c0a7d3cee89f src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Tue May 14 12:05:36 2013 +0200 +++ b/src/ldt/ldt/__init__.py Wed May 15 12:18:24 2013 +0200 @@ -1,4 +1,4 @@ -VERSION = (1, 49, 1, "final", 0) +VERSION = (1, 49, 2, "final", 0) def get_version(): diff -r f305d9a7d0b1 -r c0a7d3cee89f src/ldt/ldt/ldt_utils/views/lignesdetemps.py --- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Tue May 14 12:05:36 2013 +0200 +++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Wed May 15 12:18:24 2013 +0200 @@ -218,7 +218,7 @@ return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': urlStr, 'posturl': posturl, - 'id': id, 'readonly': readonly}, + 'id': id, 'readonly': readonly, 'audio_record_url': audio_record_url}, context_instance=RequestContext(request))