Commit graph

7 commits

Author SHA1 Message Date
Jeremy Kauffman
b70f169256 much progress towards a working merge 2017-05-04 11:59:46 -04:00
6ea86b96
8f57420127 Increase deactivate search timeout 2017-05-04 11:59:45 -04:00
6ea86b96
d2e7d7f1df Downloaded file list kind of working. Not sure about sort. 2017-05-04 11:59:45 -04:00
6ea86b96
21818c57a8 Fix NSFW blurring on search and make search show/hide smarter 2017-05-04 11:59:45 -04:00
6ea86b96
1fd94e7902 Working on search 2017-05-04 11:59:45 -04:00
6ea86b96
cb5067dce3 Progress on featured content 2017-05-04 11:59:45 -04:00
6ea86b96
b90e35355d Wallet progress 2017-05-04 11:59:45 -04:00