Merge branch 'master' into timeline-zoom-center-936

Browse Source

Conflicts:
	platform/features/timeline/src/controllers/TimelineZoomController.js
	platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js

...

This commit is contained in:

Victor Woeltjen 2016-06-03 09:16:59 -07:00

parent 23b64951f3 e86e955682

commit ee0fa0451a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available