Victor Woeltjen 93debb4abe Merge branch 'open-master' into open940b ...

Merge in latest from open-master into topic branch for
WTD-940, merge of fixed position look-and-feel updates.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/src/elements/ElementFactory.js

2015-03-04 14:52:01 -08:00

..

res/templates

[Fixed Position] Wrap mct-include is div

2015-03-04 14:46:28 -08:00

src

Merge branch 'open-master' into open940b

2015-03-04 14:52:01 -08:00

test

Merge branch 'open-master' into open940b

2015-03-04 14:52:01 -08:00

bundle.json

[Frontend] In-progress checkin: added new symbols for Fixed Position view

2015-02-25 16:44:11 -08:00