Merge branch 'master' into master_to_develop

This commit is contained in:
Rachel Fenichel
2018-04-13 14:46:50 -07:00
11 changed files with 88 additions and 48 deletions

View File

@@ -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"
},

View File

@@ -2,7 +2,8 @@
"@metadata": {
"authors": [
"McDutchie",
"Karmwiki"
"Karmwiki",
"Fanjiayi"
]
},
"VARIABLES_DEFAULT_NAME": "cosa",