Trever Fischer 82222860c9 Merge branch 'master' of dev.camin.us:www ...

Conflicts:
	profiles/models.py
	profiles/views.py
	templates/base_full.html

2012-03-04 23:22:47 -05:00

..

admin

Redefine the site branding for the admin section

2012-02-19 17:47:18 -05:00

flatpages

Integrate flatpages app

2012-02-25 14:12:57 -05:00

forums

Use minecraft avatars

2012-03-03 22:09:40 -05:00

news

Implement the new design

2012-03-02 14:51:20 -05:00

petition

Implement the new design

2012-03-02 14:51:20 -05:00

profiles

use base_simple in some old templates

2012-03-04 14:39:21 -05:00

registration

Initial commit

2012-02-17 15:36:35 -05:00

base_full.html

Merge branch 'master' of dev.camin.us:www

2012-03-04 23:22:47 -05:00

base_simple.html

Implement the new design

2012-03-02 14:51:20 -05:00

base.html

Implement the new design

2012-03-02 14:51:20 -05:00

forum_base.html

Implement a basic forum

2012-02-18 15:31:13 -05:00

news_base.html

Implement the new design

2012-03-02 14:51:20 -05:00

profile_base.html

Implement the new design

2012-03-02 14:51:20 -05:00