Victor Woeltjen 0036974c60 Merge remote-tracking branch 'github/master' into open450b
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
2016-01-08 15:36:10 -08:00
..

Directives

  • mct-scroll-x is an attribute whose value is an assignable Angular expression. This two-way binds that expression to the horizontal scroll state of the element on which it is applied.
  • mct-scroll-y is an attribute whose value is an assignable Angular expression. This two-way binds that expression to the vertical scroll state of the element on which it is applied.