Skip to content

Commit

Permalink
Merge pull request #50 from ondras/master
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
ondras committed Oct 3, 2014
2 parents 49e6a8e + 4641b35 commit 33e4a7d
Show file tree
Hide file tree
Showing 23 changed files with 634 additions and 139 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ SOURCES = src/mm.js \
src/format.freemind.js \
src/format.mma.js \
src/format.mup.js \
src/format.plaintext.js \
src/backend.js \
src/backend.local.js \
src/backend.webdav.js \
Expand Down
2 changes: 1 addition & 1 deletion examples/features.mymind
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"root": {
"id": "ujfdpxoz",
"text": "My Mind\nFeatures",
"text": "My Mind<br/>Features",
"layout": "map",
"children": [
{
Expand Down
Loading

0 comments on commit 33e4a7d

Please sign in to comment.