Merge branch 'master' into csv-export-update-751

This commit is contained in:
Victor Woeltjen 2016-05-25 12:33:43 -07:00
commit 536e2290b8
2 changed files with 8 additions and 8 deletions

View File

@ -146,7 +146,7 @@ define([
"$timeout",
"objectService"
]
},
}
],
"directives": [
{
@ -309,7 +309,7 @@ define([
"uses": [
"action"
]
},
}
],
"components": [
{