Merge branch 'master' into ja-per-user-track-changes

2017-08-01 10:56:02 +01:00
parent 47d9278e53 dcaa35f9f1
commit fbce49f5cd
18 changed files with 1667 additions and 136 deletions
@@ -293,6 +293,7 @@ module.exports = ProjectController =
 						theme : user.ace.theme
 						fontSize : user.ace.fontSize
 						autoComplete: user.ace.autoComplete
+						autoPairDelimiters: user.ace.autoPairDelimiters
 						pdfViewer : user.ace.pdfViewer
 						syntaxValidation: user.ace.syntaxValidation
 					}