Tyler Renelle 906932090f Merge branch 'parties' ... Conflicts: src/app/helpers.coffee src/app/scoring.coffee		2013-02-06 14:16:52 -05:00
..
app	Merge branch 'parties'	2013-02-06 14:16:52 -05:00
404.html	Adding empty derby project	2012-04-26 22:03:01 -04:00
privacy.html	move terms & privacy to staticPages	2012-09-02 23:01:14 -04:00
terms.html	terms modification	2012-09-02 23:05:16 -04:00