Skip to content

Merge master into dev #153

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.

Sign up for GitHub

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

Closed
avicarie wants to merge 3 commits into from

resolve conflicts

5052f9e
Select commit
Loading
Failed to load commit list.
Closed

Merge master into dev #153

resolve conflicts
5052f9e
Select commit
Loading
Failed to load commit list.

Select a check to view from the sidebar