Changeset 20b5844f in oe-alliance-core

Timestamp:
01/02/17 13:56:01 (7 years ago)
Author:
captain <openatv@…>
Branches:
4.0, 4.3
Children:
8cfad25
Parents:
f5f14fc (diff), d9902f7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch '4.0' of github.com:oe-alliance/oe-alliance-core into 4.0

(No files)

Note: See TracChangeset for help on using the changeset viewer.