aboutsummaryrefslogtreecommitdiffstats
path: root/make/otp_version_tickets_in_merge
AgeCommit message (Collapse)Author
2019-01-25Merge branch 'maint'Lukas Larsson
* maint: Updated OTP version Prepare release Include erlang-logo128.png in release Enable setting custom application icon for Mac OS X through environment variable Update to icon with better resolution
2019-01-25Merge branch 'maint-21' into maintLukas Larsson
* maint-21: Updated OTP version Prepare release