Merge remote branch 'sarava/master'
authorLunar <lunar@anargeek.net>
Fri, 24 Feb 2012 18:44:12 +0000 (19:44 +0100)
committerLunar <lunar@anargeek.net>
Fri, 24 Feb 2012 18:44:12 +0000 (19:44 +0100)
1  2 
README
lib/coquelicot/app.rb
views/ready.haml

diff --cc README
--- 1/README
--- 2/README
+++ b/README
@@@ -104,8 -105,12 +104,8 @@@ On Debian, one can fulfill its dependen
  
      apt-get install libsinatra-ruby1.8 libopenssl-ruby1.8 \
                      libhaml-ruby1.8 liblockfile-ruby libgettext-ruby1.8 \
-                     rake
+                     libjson-ruby1.8 rake
  
 -Then create the translation catalog through:
 -
 -    rake makemo
 -
  Finally you need to figure out the best way to host a Rack application
  depending on your setup. *evil grin*
  
Simple merge
Simple merge