resolve conflicts
Dependencies
- [2]
ZNFBMLWJresolve conflicts - [3]
R5LETMRZresolve conflicts - [4]
JYXWR7VKresolve conflicts - [5]
VVGWHJBZfix app identity so successive versions share data - [6]
RJPNFXVQnew fork: a personal dashboard for mobile devices - [7]
FSQ7OI4Mnew fork: a template for carousel-based apps