Merge branch '905-activities'
commit9a1fc423ac298c2ddf078d91ea1302c135285781
authorJessica Tallon <jessica@megworld.co.uk>
Tue, 7 Oct 2014 09:01:38 +0000 (7 10:01 +0100)
committerJessica Tallon <jessica@megworld.co.uk>
Tue, 7 Oct 2014 09:01:38 +0000 (7 10:01 +0100)
treec3a42caff8b46803a3af48cdd3afbdeb11427e29
parent670cdef79c39262fa0844a91777b8c69751bab01
parent2b1916182d36043c2dbce7c2718e8e1d1a976429
Merge branch '905-activities'

    Add Activity and Generator models which allow for
    activities to be created. This now works with the
    feed API.
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/federation/routing.py
mediagoblin/federation/views.py
mediagoblin/submit/lib.py
mediagoblin/user_pages/views.py