Commit 30b3fc60 authored by Matt Evanoff's avatar Matt Evanoff
Browse files

Merge branch 'master' into 1384---Profile-picture-upload-should-be-done-through-the-imagehoster 

* master:
  log number of parallel requests (#1553)
parents a6925cc1 d02bb77d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment