Merge remote-tracking branch 'refs/remotes/origin/master' into bug-fixes

paintballrefjosh · Apr 10, 2017 · a6b564e · a6b564e
2 parents 18d3ab9 + d13d571
commit a6b564e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/update/update_list.txt b/update/update_list.txt
@@ -1,4 +1,5 @@
+4.1.2,4.1.0
 4.1.1,4.1.0
 4.1.0,4.1.0
 4.0.6,4.0.5
-4.0.0,1.0a
+4.0.0,1.0a