Merge branch 'master' into release-2.2.1

revert-dabc3590
Chatura Dilan Perera 8 years ago
commit 93cecb0ded

@ -16,6 +16,8 @@
under the License. under the License.
}} }}
{{unit "mdm.unit.date-range-picker"}}
{{#zone "content"}} {{#zone "content"}}
<div id = "operations-mod" data-permissions="{{permissions}}"> <div id = "operations-mod" data-permissions="{{permissions}}">
{{unit "mdm.unit.device.operation-mod"}} {{unit "mdm.unit.device.operation-mod"}}

Loading…
Cancel
Save