Mario Visic 9f56eecd56 Merge branch 'master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/boot.rb		2011-11-27 20:33:45 +11:00
..
drops	refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)	2011-11-25 02:04:42 +01:00
filters	Fixed some failing dragonfly specs.	2011-11-27 19:02:20 +11:00
tags	Merge remote-tracking branch 'origin/master' into rails_3_1	2011-11-20 21:08:23 +11:00
errors.rb	handle more liquid errors during page editing	2010-08-22 00:58:26 +02:00