c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging microbit/master

Browse Source
This commit is contained in:
Peli de Halleux
2016-10-24 10:27:48 -07:00
parent 99bee9e796 06641d4e5c
commit cf778686c3
153 changed files with 3846 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/static/icons/browserconfig.xml vendored
View File

@ -6,7 +6,11 @@
<square150x150logo src="/mstile-150x150.png"/>
<square310x310logo src="/mstile-310x310.png"/>
<wide310x150logo src="/mstile-310x150.png"/>
<<<<<<< HEAD
<TileColor>#da532c</TileColor>
=======
<TileColor>#9f00a7</TileColor>
>>>>>>> microbit/master
</tile>
</msapplication>
</browserconfig>

BIN
docs/static/icons/favicon.ico vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB