Moxie Marlinspike d5f0415907 Merge branch 'master' of github.com:WhisperSystems/TextSecure ... Conflicts: src/org/thoughtcrime/securesms/GroupCreateActivity.java src/org/thoughtcrime/securesms/database/GroupDatabase.java		2014-02-24 00:23:40 -08:00
..
org/thoughtcrime/securesms	Merge branch 'master' of github.com:WhisperSystems/TextSecure	2014-02-24 00:23:40 -08:00
ws/com/google/android/mms	Refactor group database model and flow.	2014-02-19 21:07:47 -08:00