Merge branch 'master' into develop

This commit is contained in:
jos 2016-10-26 21:03:53 +02:00
commit d76b3422fc

View File

@ -30,6 +30,7 @@
"Kunal Vyas (https://github.com/kv-kunalvyas)",
"Marcus Andre (https://github.com/marcusandre)",
"Horatiu Lazu (https://github.com/MathBunny)",
"Mathias Polligkeit (https://github.com/woylie)",
"Max Bruckner (https://github.com/FSMaxB)",
"Mitchel Kelonye (https://github.com/kelonye)",
"mtraynham (https://github.com/mtraynham)",
@ -47,7 +48,6 @@
"Stu Blair (https://github.com/stu-blair)",
"Thomas Brierley (https://github.com/ThomasBrierley)",
"Waldir Pimenta (https://github.com/waldyrious)",
"Woylie (https://github.com/woylie)",
"Zach Zibrat (https://github.com/palimpsests)"
],
"homepage": "http://mathjs.org",