Konstantin Haase 7ce79917dd Merge branch 'master' into rkh-pusher ... Conflicts: public/javascripts/application.js public/stylesheets/application.css		2012-09-23 02:45:21 +02:00
..
specs	Fix specs and a bug that they've catched	2012-08-12 02:26:45 +02:00
application.js	Merge branch 'master' into rkh-pusher	2012-09-23 02:45:21 +02:00
vendor.js	fix persisting the minimized sidebar status	2012-09-23 02:22:13 +02:00