Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two way links from api to example added #970

Merged
merged 1 commit into from Mar 31, 2016

Conversation

fredj
Copy link
Member

@fredj fredj commented Mar 31, 2016

Sync the master and 2.0 branches

Related issue: camptocamp#834

Conflicts:
	src/services/decoratelayer.js
@fredj fredj merged commit 4403d70 into camptocamp:master Mar 31, 2016
@fredj fredj deleted the cherry-pick_962ab0 branch March 31, 2016 07:33
@sbrunner sbrunner added this to the Older milestone Aug 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants