Andrew Cantino: cffd6dc48a Merge remote-tracking branch 'origin/master' into openshift2 10 lat temu
..
environments b071f6170d openshift setup is working 10 lat temu
initializers 7e7bdc6eca Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge 10 lat temu
locales 7e7bdc6eca Fixing messed up merge with upstream master, repairing broken Tumblr auth from messed up merge 10 lat temu
application.rb cffd6dc48a Merge remote-tracking branch 'origin/master' into openshift2 10 lat temu
boot.rb 620acffa5a initial commit 12 lat temu
database.yml b071f6170d openshift setup is working 10 lat temu
environment.rb 620acffa5a initial commit 12 lat temu
routes.rb 2f1ff3192c Remove the constraints on services callback, since there is a spec against it. 10 lat temu
smtp.yml 9874e2b41a moving mail config into an initializer and a config/smtp.yml file 11 lat temu