diff options
| author | Uģis Ozols <ugis.ozolss@gmail.com> | 2014-01-20 11:25:47 +0200 |
|---|---|---|
| committer | Uģis Ozols <ugis.ozolss@gmail.com> | 2014-01-20 11:25:47 +0200 |
| commit | 249af183145b1608686528255af9c031485683b8 (patch) | |
| tree | ade3dcf168e5bf700154228044d588615e991975 /lib/generators/refinery/blog/templates | |
| parent | a8b5bce609089af8795768230c7dd3a9b87cd5e0 (diff) | |
| parent | d891009d8b26cbccfc7fcdec645e1e2382c641bc (diff) | |
| download | refinerycms-blog-249af183145b1608686528255af9c031485683b8.tar.gz refinerycms-blog-249af183145b1608686528255af9c031485683b8.tar.bz2 refinerycms-blog-249af183145b1608686528255af9c031485683b8.zip | |
Merge branch 'master' into rails4
Conflicts:
app/helpers/refinery/blog/controller_helper.rb
app/models/refinery/blog/post.rb
Diffstat (limited to 'lib/generators/refinery/blog/templates')
0 files changed, 0 insertions, 0 deletions