Merge branch 'master' into feature-linux-desktop-icon

This commit is contained in:
grunjol
2016-03-20 20:02:29 -03:00

View File

@@ -10,5 +10,6 @@
- Romain Beaumont <romain.rom1@gmail.com>
- Dan Flettre <fletd01@yahoo.com>
- Liam Gray <liam.r.gray@gmail.com>
- grunjol <grunjol@argenteam.net>
#### Generated by bin/update-authors.sh.