From: Vijeth Aradhya <vijthaaa@gmail.com>
Date: Mon, 14 Aug 2017 12:08:36 +0000 (+0000)
Subject: Merge branch 'master' into 'multiple-qualities-frontend'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2bb617fa9e3f9cf1a6171654bf985c40951741b6;p=mediagoblin.git

Merge branch 'master' into 'multiple-qualities-frontend'

Add multiple video qualities feature

See merge request !2
---

2bb617fa9e3f9cf1a6171654bf985c40951741b6