Victor Woeltjen e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427 ...

Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html

2015-07-15 13:45:37 -07:00

..

edit-action-buttons.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

edit-object.html

Merge remote-tracking branch 'nasa/open1404' into open1427

2015-07-15 13:45:37 -07:00

edit.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

elements.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

library.html

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

topbar-edit.html

[Fronted] Significant refactoring of btn classes

2015-06-10 17:23:08 -07:00