Commit Graph

1 Commits

Author SHA1 Message Date
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