Will Bradley 0bc5858101 Merged more conflicts

2012-09-15 17:44:30 -07:00

..

.gitkeep

Surprise Rails app!

2012-08-30 23:54:25 -07:00

ability.rb

Trying to get ability filtering down but failing on collections

2012-09-03 23:20:00 -07:00

door_log.rb

Surprise Rails app!

2012-08-30 23:54:25 -07:00

user.rb

Merged more conflicts

2012-09-15 17:44:30 -07:00