Skip to content
Snippets Groups Projects
Commit 0a05d874 authored by Phil Hughes's avatar Phil Hughes
Browse files

Merge branch 'master' into 'ph-es-notes-module'

# Conflicts:
#   app/assets/javascripts/main.js
parents eaf2f48d b4ea25ca
Branches 40063-markdown-editor-improvements
No related tags found
No related merge requests found
Showing
with 534 additions and 457 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