Victor Woeltjen dddc2f976e Merge branch 'open1223' into open1317limits ...

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html

2015-06-25 12:48:02 -07:00

..

res/templates

Merge branch 'open1223' into open1317limits

2015-06-25 12:48:02 -07:00

src

Merge branch 'open-master' into open1223

2015-06-23 13:29:47 -07:00

test

[Limits] Disable failing specs

2015-06-23 13:43:00 -07:00

bundle.json

[Frontend] Fixes, glyph and description updates

2015-04-28 14:28:17 -07:00