Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into rails-3-1 | Philip Arndt | 2011-11-10 | 1 | -8/+1 |
| | | | | | | Conflicts: app/controllers/admin/blog/posts_controller.rb app/controllers/blog/posts_controller.rb | ||||
* | WIP - use asset pipeline. | Uģis Ozols | 2011-08-03 | 1 | -0/+337 |