Merge branch 'master' of /Users/reden/Documents/trove with conflicts.

leventov · Nov 15, 2014 · 9f7cb0a · 9f7cb0a
1 parent b152b47
commit 9f7cb0a
Show file tree

Hide file tree

Showing 8 changed files with 2,376 additions and 2,106 deletions.
diff --git a/README-idea-devel.txt b/README-idea-devel.txt