Victor Woeltjen 5ab2ceb333 Merge branch 'open940b' into open929 ... Merge in Fixed Position updates to reconcile conflicts related to generalization of selection mechanism, WTD-929. Conflicts: platform/features/layout/src/FixedController.js platform/features/layout/test/FixedControllerSpec.js		2015-03-04 15:09:46 -08:00
..
res/templates	[Fixed Position] Wrap mct-include is div	2015-03-04 14:46:28 -08:00
src	Merge branch 'open940b' into open929	2015-03-04 15:09:46 -08:00
test	Merge branch 'open940b' into open929	2015-03-04 15:09:46 -08:00
bundle.json	[Frontend] In-progress checkin: added new symbols for Fixed Position view	2015-02-25 16:44:11 -08:00