aboutsummaryrefslogtreecommitdiffstats
path: root/.rspec
diff options
context:
space:
mode:
authorUģis Ozols <ugis.ozolss@gmail.com>2014-01-20 11:25:47 +0200
committerUģis Ozols <ugis.ozolss@gmail.com>2014-01-20 11:25:47 +0200
commit249af183145b1608686528255af9c031485683b8 (patch)
treeade3dcf168e5bf700154228044d588615e991975 /.rspec
parenta8b5bce609089af8795768230c7dd3a9b87cd5e0 (diff)
parentd891009d8b26cbccfc7fcdec645e1e2382c641bc (diff)
downloadrefinerycms-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 '.rspec')
0 files changed, 0 insertions, 0 deletions