From 2754961708ff0eb6030faf6db2edf8fbdae227d5 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Mon, 11 Jan 2016 12:25:06 +0000
Subject: Document edit capability via ProseMirror submodule #974

+ New docEdit page with links from docPage and docList
+ Bespoke menu system with full screen edit mode
+ npm required for building client side scripts
+ Ant script added for BuildUI which performs npm commands
+ Update font-awesome to 4.5.0
+ Factor out to JGitUtils common code in BranchTicketService for EditFilePage
	+ getTreeEntries
	+ commitIndex
+ Merge capability for document editing
---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitmodules')

diff --git a/.gitmodules b/.gitmodules
index 01eaa2c8..25cab4a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/main/distrib/data/gitignore"]
 	path = src/main/distrib/data/gitignore
 	url = https://github.com/github/gitignore.git
+[submodule "src/main/js/prosemirror"]
+	path = src/main/js/prosemirror
+	url = https://github.com/ProseMirror/prosemirror.git
-- 
cgit v1.2.3