deac
/
mailr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'from_scratch' of github.com:musashimm/mailr into from_scratch 

Conflicts:
	Gemfile.lock
	app/controllers/messages_controller.rb
	config/defaults.yml
	config/routes.rb
	themes/olive/stylesheets/style.css
	themes/olive/views/messages/_msg_ops.html.erb
	themes/olive/views/messages/show.html.erb
from_scratch
Wojciech Todryk 2011-08-24 19:28:51 +02:00
parent b9561278d0 751fae97f3
commit 649dc660df
1 changed files with 0 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Gemfile.lock
View File

@ -1,79 +0,0 @@
GEM
remote: http://rubygems.org/
specs:
actionmailer (3.0.7)
actionpack (= 3.0.7)
mail (~> 2.2.15)
actionpack (3.0.7)
activemodel (= 3.0.7)
activesupport (= 3.0.7)
builder (~> 2.1.2)
erubis (>= 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (>= 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.7)
activesupport (= 3.0.7)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.7)
activemodel (= 3.0.7)
activesupport (= 3.0.7)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activeresource (3.0.7)
activemodel (= 3.0.7)
activesupport (= 3.0.7)
activesupport (3.0.7)
arel (2.0.10)
builder (2.1.2)
erubis (2.7.0)
ezcrypto (0.7.2)
i18n (0.5.0)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
mysql2 (0.2.7)
polyglot (0.3.1)
rack (1.2.3)
rack-mount (0.8.1)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.7)
actionmailer (= 3.0.7)
actionpack (= 3.0.7)
activerecord (= 3.0.7)
activeresource (= 3.0.7)
activesupport (= 3.0.7)
bundler (~> 1.0)
railties (= 3.0.7)
railties (3.0.7)
actionpack (= 3.0.7)
activesupport (= 3.0.7)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.9.2)
themes_for_rails (0.4.2)
rails (~> 3.0.0)
themes_for_rails
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.29)
will_paginate (3.0.pre4)
PLATFORMS
ruby
DEPENDENCIES
ezcrypto (~> 0.7.2)
mysql2 (~> 0.2.7)
rails (~> 3.0.7)
themes_for_rails
will_paginate (~> 3.0.beta)