fix is loading if error
fixing search results loading
Merge remote-tracking branch 'upstream/master' into is-loading
fixing karma
changing chargebacks to disputes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
merging
results is loading
merged
merging
merging
merging properly
fix results
fixing activity controller
activity type
adding tests
fixing comments
Merge remote-tracking branch 'upstream/master'