public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-21 05:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9853 commits 16 branches 13 tags 926 MiB
Commit graph

954 commits

Author SHA1 Message Date
ojiikun
b5065e98c7 Remove crash-causing background animation. 2013-07-02 23:38:07 +00:00
ojiikun
a44b1410e6 Fix bad merge. 2013-07-02 09:22:09 +00:00
ojiikun
98ea0b4892 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	clients/android/NewsBlur/src/com/newsblur/network/APIClient.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/LoginErrors.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/LoginResponse.java
	clients/android/NewsBlur/src/com/newsblur/network/domain/Message.java
	media/android
	media/android/NewsBlur/src/com/newsblur/network/domain/LoginErrors.java
	media/android/NewsBlur/src/com/newsblur/network/domain/ResponseErrors.java
 2013-07-02 08:53:47 +00:00
Samuel Clay
bfff777490 Moving ios and android from media to clients. 2013-06-27 09:43:22 -07:00