search

JavaJens / TextSecure

A secure text messaging application for Android.
GNU General Public License v3.0
71 stars 9 forks source link

Merge upstream 2.26.1 into Feature/websocket reborn #34

Closed relyt29 closed 9 years ago

relyt29 commented 9 years ago

Tested and done in the usual fashion

adb-screenshot-2015-09-07-13-06-46-426652379

schachmat commented 9 years ago

@JavaJens just a little hint for merging the updates: If you do it with the commandline as described by github and not with the web interface button, you can do a fast-forward merge, which does not produce another extra merge commit and keeps a linear history.

JavaJens commented 9 years ago

@schachmat Great! Thanks, I will definitely do it next time.