mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 09:03:40 +02:00
Resolved conflict in ChangeLog
This commit is contained in:
@@ -14489,3 +14489,6 @@
|
||||
2014-09-20 Alban Peignier <alban@tryphon.eu>
|
||||
* Merged patch from albanpeignier to use global cue assignments
|
||||
for RDCueEdit, Audition Hea/Tail in RDAirPlay [GitHub issue #000024].
|
||||
2014-09-19 Alban Peignier <alban@tryphon.eu>
|
||||
* Fixed 'web/rdxport/carts.cpp' which tried to create associated group
|
||||
during cart creation
|
||||
|
Reference in New Issue
Block a user