Chad Whitacre 24bb7fcaab Merge branch 'master' into username ...

Conflicts:
	www/%username/history/index.html
	www/assets/%version/gittip.css

2013-04-06 21:04:54 -04:00

..

about.html

Rationalize the CSS for nav

2013-03-08 00:43:09 -05:00

base.html

Merge branch 'master' into username

2013-04-06 21:04:54 -04:00

connected-accounts.html

Big changeover from id to username; #287

2013-04-05 15:48:59 -04:00

gittip.scss

Merge branch 'master' into username

2013-04-06 21:04:54 -04:00

nav.html

Redesign about pages (except delpan); #598

2013-02-07 02:59:45 -05:00

participant.html

Big changeover from id to username; #287

2013-04-05 15:48:59 -04:00

profile-edit.html

Big changeover from id to username; #287

2013-04-05 15:48:59 -04:00

profile.html

Big changeover from id to username; #287

2013-04-05 15:48:59 -04:00

tip-distribution.html

Fix width on distribution bars; #620 == #701

2013-03-05 17:49:27 -05:00