Merge branch 'master' into react

Browse Source

We're shifting master to a new branch named v1.x. Any changes made since the react branch were forked are not applicable to v2.x development. We'll recursively merge using the "ours" strategy, and then pull this into master to effectively make our "react" version (v2.x) the new master.

...

This commit is contained in:

dannyrb 2019-05-15 21:47:18 -04:00

parent e9c54f17de 7ff9a87b6e

commit d69b014721

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