Changeset 4a5708a

Timestamp:
Aug 18, 2018 3:48:16 PM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
8b9e5de9
Parents:
8bebda2e (diff), 7cf79a3 (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 of 'e44534030f8f27481da60564e03f4b097f032c89'

and 'eea0aed1232ed304fa6ffeaeee28d9399bf3efdc'

Location:
licenses
Files:
2 added

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