Feature/reinstate#8

Open

matthappens wants to merge 10 commits intoella:masterfrom

whalerock:feature/reinstate

Commits on Aug 22, 2013

Added edit timer to FlatComments. By default, users have 15 minutes from
Luis Artola
committed

Commits on Oct 1, 2013

Checking whether edit timer is enabled in settings or not.
Luis Artola
committed

Commits on Oct 2, 2013

Merge 'ella/master' into 'WhiskeyMedia/master'
kvbik
committed

Commits on Jan 14, 2014

Accounting for modules deprecated in Django 1.6, trying to be backwards compatible wherever possible.
Luis Artola
committed

Commits on Jan 28, 2014

Merge pull request #1 from WhiskeyMedia/django16
honzakral
committed

Commits on Jul 29, 2014

Create circle.yml
colony005
committed

Commits on Dec 17, 2014

adding comment reinstate methods
matthappens
committed

Commits on Dec 18, 2014