Changeset [04d15e5cbc19e2d5476a29acbb25b0b7672b9fe9] by Marnen Laibow-Koser
Revision 04d15e5cbc19e2d5476a29acbb25b0b7672b9fe9,
committed by Marnen Laibow-Koser
· September 9th, 2011 @ 08:58 PM
Merge branch 'master' into 57-fix-html-escaping
https://github.com/marnen/quorum2/commit/04d15e5cbc19e2d5476a29acbb...
5 changed files
-
M
spec/factories.rb -
M
spec/models/event_spec.rb -
M
spec/models/user_spec.rb -
M
vendor/plugins/acts_as_addressed/lib/acts/addressed/address.rb -
M
vendor/plugins/acts_as_addressed/lib/acts_as_addressed.rb