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

Release/2.0 #70

Merged
merged 658 commits into from
Jul 18, 2017
Merged

Release/2.0 #70

merged 658 commits into from
Jul 18, 2017

Conversation

mehul0810
Copy link
Owner

Merge

ravinderk and others added 29 commits July 5, 2017 12:27
Resolved Conflicts:
1.	assets/js/admin/admin-scripts.js
2.	includes/user-functions.php
@mehul0810 mehul0810 merged commit cb31828 into mehul0810:issue/1249 Jul 18, 2017
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.

3 participants