Merge branch 'bookmarks' into next. This fixes #103.
[Sone.git] / src / main /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - resources