Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/initializers/will_paginate.rb lib/locomotive/engine.rb lib/locomotive/hosting/bushido/account_ext.rb lib/locomotive/hosting/bushido/enabler.rb lib/locomotive/hosting/bushido/hooks.rb		2011-11-20 21:08:23 +11:00
..
asset_collections.rb	removing asset_collections: script + remove references in liquid	2011-06-20 04:25:17 -07:00
base.rb	Revert "Arrays now paginate correctly."	2011-10-24 23:34:43 +08:00
content.rb	Added examples	2011-09-16 11:37:48 +08:00
contents.rb	Merge remote-tracking branch 'origin/master' into rails_3_1	2011-11-20 21:08:23 +11:00
page.rb	adding .published? and .listed? methods for the liquid Page drop class	2011-10-04 04:35:40 +03:00
site.rb	remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring	2011-07-04 19:40:14 +02:00