Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master-3.0'

# Conflicts:
#	BACKERS.md
#	Xenko.xkpkg
#	sources/shared/SharedAssemblyInfo.cs
  • Loading branch information
xen2 committed Feb 6, 2019
2 parents 762e955 + eda8da0 commit 5f596657e006bfea9ebbf0f04302df5e3f3aed85
Showing with 1 addition and 1 deletion.
  1. +1 −1 BACKERS.md
@@ -38,7 +38,6 @@ Thank you everybody for your generous contributions!
* Antony K. Jones
* Thomas Tang
* Beliar
* Robert Iadanza
* SleepyMode
* Marko Viitanen
* Sven-Bertil Blom
@@ -50,6 +49,7 @@ Thank you everybody for your generous contributions!
* Andrew Wilson
* Boris Callens
* Jarrett K Robertson
* Daniel Keenan

## Mini Backers

0 comments on commit 5f59665

Please sign in to comment.
You can’t perform that action at this time.