« Previous | Next » 

Revision 2f1495c2

ID2f1495c24c90f6c45b54b027a76ec743e5e2098f
Parent 2e7d4512, 41905c8a
Child 83c0035b

Added by n8fr8 over 4 years ago

Merge branch 'fixes2' of https://github.com/devrandom/Gibberbot into devrandom-fixes2

Conflicts:
src/info/guardianproject/otr/app/im/app/ChatView.java

Files

  • added
  • modified
  • copied
  • renamed
  • deleted