« Previous | Next » 

Revision 046ec336

ID046ec336649a8e2b9d031bc3e4f86f54213ab8b2
Parent f520e8ae, 8aae349b
Child 8e40d141

Added by vitriolix over 3 years ago

Merge branch 'master' into secureshare

Conflicts:
app/AndroidManifest.xml
app/src/info/guardianproject/mrapp/model/Auth.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted