Master into 0.15.x#4621

Merged

benjaoming merged 19 commits into

learningequality:0.15.xfrom

benjaoming:master-into-0.15.x

Oct 13, 2015

Commits on Sep 7, 2015

Commits on Sep 25, 2015

Merge pull request #4493 from arnoan/patch-1
aronasorman
committed
Generate a secret key file, and load SECRET_KEY from said file.

aronasorman
authored and
Aron Fyodor Asor
committed
Merge pull request #4494 from aronasorman/4213
aronasorman
committed

Commits on Sep 30, 2015

bump version to 0.14.1.
Aron Fyodor Asor
committed

Commits on Oct 5, 2015

Merge pull request #4485 from learningequality/0.14.x
benjaoming
committed

Commits on Oct 7, 2015

Commits on Oct 8, 2015

Commits on Oct 13, 2015