Fix merge conflict#81
Open
Jeffterp wants to merge 62 commits into
Open
Commits
Commits on Sep 5, 2017
- authored
- committed
- committed
Richard Prather - committed
- committedgdune
- committed
- committedjazzy
- committedSara Bittner
- committed
- committed
- authored
- committed
- committed
- authored
- authored
- authored
- committed
- authored
- authored
- authoredgdune
- authored
- authored
- committed
- authored
- authored
- committedUbuntu
- authoredgdune
- authored
- authored
- committedJayu Dewani
- authored
- authored
- committed
- committed
- authored
- authored
- authored
- committed
- authored
- authored
- authored
- committed
- authored
- authored andcommitted
- committed
- authored
- authored
- committed
- committedRichard Prather
- committed
- authored
- committedRichard Prather
- committed
- authored
- authored
- committed
- authored
- authored
- authored
- authored
- committed
- committed
