[macports-ports] 06/06: Merge branch 'master' of github.com:macports/macports-ports

[Ryan Schmidt]

On Jul 24, 2018, at 13:51, Mark Moll wrote:

> Mark Moll (mamoll) pushed a commit to branch master
> in repository macports-ports.
> 
> 
> https://github.com/macports/macports-ports/commit/d5637d824ed07189a10a3e32dc135fe909192f8c
> 
> commit d5637d824ed07189a10a3e32dc135fe909192f8c
> 
> Merge: 04b975b d8d582f
> Author: Mark Moll
> AuthorDate: Tue Jul 24 13:51:18 2018 -0500
> 
> 
>     Merge branch 'master' of github.com:macports/macports-ports

In the future, please rebase instead of merging, so that we can maintain a linear history.