-n 
update dist snapshot
-n 
snapshot
-n 
updated a link
-n 
updated a link
updated snapshot
added snapshot
-n 
added snapshot
 merged with conflict for dist snapshot
-n 
 merged with conflict for dist snapshot
 fixed conflict
-n 
 fixed conflict
fixed register bug
-n 
fixed register bug
testing build
Merge commit '49904471e05d3ad915f2e7573598b324bc305eb4'
reset to dev
omitted dist