Merge branch 'bug/318' into dev
Conflicts: AUTHORS
This commit is contained in:
commit
fbe8b28b2e
4 changed files with 27 additions and 2 deletions
1
AUTHORS
1
AUTHORS
|
|
@ -76,3 +76,4 @@ that much better:
|
|||
* Adam Parrish
|
||||
* jpfarias
|
||||
* jonrscott
|
||||
* Alice Zoë Bevan-McGregor
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue