mirror of
https://github.com/google/blockly.git
synced 2026-01-10 18:37:09 +01:00
Merge branch 'master' into master_to_develop
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"@metadata": {
|
||||
"author": "Ellen Spertus <ellen.spertus@gmail.com>",
|
||||
"lastupdated": "2018-02-08 15:48:36.801901",
|
||||
"lastupdated": "2018-03-06 15:07:55.902880",
|
||||
"locale": "en",
|
||||
"messagedocumentation" : "qqq"
|
||||
},
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
"@metadata": {
|
||||
"authors": [
|
||||
"McDutchie",
|
||||
"Karmwiki"
|
||||
"Karmwiki",
|
||||
"Fanjiayi"
|
||||
]
|
||||
},
|
||||
"VARIABLES_DEFAULT_NAME": "cosa",
|
||||
|
||||
Reference in New Issue
Block a user