Commit Graph

2 Commits

Author SHA1 Message Date
Erik Michaels-Ober 1174647779 Cleanup trailing whitespace
Trailing whitespace isn't friendly to git or vim users.
2012-03-06 14:04:32 -08:00
Cory Schires e2ee248fba Added documentation for ability to set conditions for recording impressions. Also, Had to do some work to get the tests passing
Merge remote branch 'upstream/master'

Conflicts:
  test_app/Gemfile.lock
2011-11-27 13:39:45 -06:00