« Previous | Next » 

Revision 7ecb0474

ID7ecb04741aa5f31ca34c40f2f626d3cfc44cea63
Parent 055d35e6, d567e8ac
Child a609f508

Added by vitriolix almost 4 years ago

Merge branch 'master' of github.com:vitriolix/mrapp into secureshare

Conflicts:
app/AndroidManifest.xml

Files

  • added
  • modified
  • copied
  • renamed
  • deleted