Skip to content
Snippets Groups Projects
Commit ce31f632 authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge branch 'dev' into issue_1655_license

Conflicts:
	resources/views/layout.ejs
parents 903dee3f ff995941
Loading
Showing
with 176 additions and 66 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment