index on master: ce112b5 Merge branch 'master' of github.com:monotasker/bloglet
WIP on master: ce112b5 Merge branch 'master' of github.com:monotasker/bloglet
new submodule updates
submodule updates
sync with remote
Recovering lost changes after reset --hard
Merge commit 'dc416bdcbbe79c4378d906f46be0c3ba6288c5de'
Merge commit '51fc757b664900b659848128082e40e4490abfaa'
Merge commit '9b1cc64841f645338425fcadc0842554ccaea49b'
recovering changes
Fixed plugin_framework submodule setup
db changes
Recovered working version of witnesses code
resolving merge conflicts
removed node_modules
utils update; progress on woh
fixed .gitignores for main and plugin_utils, no longer tracking static/audio
resolving merge problems