pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual merge conflicts in AUTHORS

Browse Source
This commit is contained in:
Paul-Armand Verhaegen
2015-11-27 23:55:55 +01:00
parent 3c18f79ea4 a6e996d921
commit 6133f04841
14 changed files with 268 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@@ -229,4 +229,7 @@ that much better:
* Emile Caron (https://github.com/emilecaron)
* Amit Lichtenberg (https://github.com/amitlicht)
* Lars Butler (https://github.com/larsbutler)
* George Macon (https://github.com/gmacon)
* Ashley Whetter (https://github.com/AWhetter)
* Paul-Armand Verhaegen (https://github.com/paularmand)