Marcin Kulik c4f40322ed Merge branch 'master' into comments ... * master: Display asciicast author and creation time Claiming asciicasts User#add_user_token Asciicast.assign_user User tokens for assigning asciicasts to users Better styles + pagination Conflicts: app/models/asciicast.rb db/schema.rb spec/factories/asciicasts.rb spec/factories/users.rb		2012-03-04 21:14:35 +01:00
..
assets	Merge branch 'master' into comments	2012-03-04 21:14:35 +01:00
controllers	Merge branch 'master' into comments	2012-03-04 21:14:35 +01:00
helpers	Display asciicast author and creation time	2012-03-04 20:59:53 +01:00
mailers	Fresh Rails 3.1 app with DM 1.2 and RSpec 2.7	2011-11-21 22:36:42 +01:00
models	Merge branch 'master' into comments	2012-03-04 21:14:35 +01:00
uploaders	Configuration with confstruct	2012-02-20 21:52:21 +01:00
views	Merge branch 'master' into comments	2012-03-04 21:14:35 +01:00