Victor Woeltjen 98caa31d7b Merge branch 'open877' into open879 ...

Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html

2015-02-17 15:58:36 -08:00

..

templates

Merge branch 'open877' into open879

2015-02-17 15:58:36 -08:00