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
..
application.css	Better styles + pagination	2012-03-04 15:18:09 +01:00
asciicasts.css.scss	Display asciicast author and creation time	2012-03-04 20:59:53 +01:00
comments.css.scss	Initial implementation of comments - in progress	2012-03-04 13:50:56 +01:00
exceptions.css.scss	404 handling	2011-11-23 21:47:09 +01:00
main.css.scss	Better styles + pagination	2012-03-04 15:18:09 +01:00
reset.css	JS & CSS from old Sinatra project	2011-11-21 23:17:11 +01:00