Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into master
  • Loading branch information
Byron authored Sep 28, 2017
commit 58998fb2dd6a1cad5faffdc36ae536ee6b04e3d2
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ Contributors are:
-Konstantin Popov <konstantin.popov.89 _at_ yandex.ru>
-Peter Jones <pjones _at_ redhat.com>
-Anson Mansfield <anson.mansfield _at_ gmail.com>
-Alexis Horgix Chotard

Portions derived from other open source works and are clearly marked.
You are viewing a condensed version of this merge commit. You can view the full changes here.