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

feature/sortable mapping rules #154

Merged
merged 19 commits into from Nov 6, 2017

Conversation

Projects
None yet
2 participants
@JorgeMartinezPizarro
Contributor

JorgeMartinezPizarro commented Oct 28, 2017

No description provided.

@JorgeMartinezPizarro JorgeMartinezPizarro requested a review from leipert Oct 28, 2017

@JorgeMartinezPizarro JorgeMartinezPizarro changed the title from Feature/sortable mapping rules to WIP: Feature/sortable mapping rules Nov 2, 2017

@JorgeMartinezPizarro JorgeMartinezPizarro changed the title from WIP: Feature/sortable mapping rules to feature/sortable mapping rules Nov 2, 2017

@JorgeMartinezPizarro JorgeMartinezPizarro changed the title from feature/sortable mapping rules to WIP: feature/sortable mapping rules Nov 3, 2017

JorgeMartinezPizarro added some commits Nov 3, 2017

Merge branch 'feature/sortableMappingRules' of https://github.com/sil…
…k-framework/silk into feature/sortableMappingRules

# Conflicts:
#	silk-react-components/src/HierarchicalMapping/Components/MappingsList.jsx
#	silk-workbench/silk-workbench-core/public/libs/silk-react-components/main.js

@JorgeMartinezPizarro JorgeMartinezPizarro changed the title from WIP: feature/sortable mapping rules to feature/sortable mapping rules Nov 3, 2017

@haschek haschek self-assigned this Nov 6, 2017

@haschek haschek merged commit 9bada6a into develop Nov 6, 2017

@haschek haschek deleted the feature/sortableMappingRules branch Nov 6, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment