Pull changes and resolve merge conflict.
[mediagoblin.git] / mediagoblin / static / css / extlib / reset.css
2013-06-21 AditiMerge remote-tracking branch 'cweb/master'
2012-01-17 Aaron WilliamsonMerged changes with upstream
2012-01-05 Jef van SchendelFix merge conflicts
2011-12-18 Jef van SchendelMove reset.css to extlib and symlink it
2011-12-18 Jef van SchendelRemove 960.gs stylesheets, add Eric Meyer's reset.css
2011-08-11 Christopher Allan... Merge branch 'master' into processing
2011-07-31 Will Kahn-Greene270. Adds symlinks for 960.gs stuff