Changeset [0a312dda469c27c1516d9c3e5607013a4ecad382] by Marnen Laibow-Koser

September 1st, 2011 @ 10:04 PM

Merge branch 'deploy'

Conflicts:

app/controllers/application_controller.rb
app/views/user_sessions/new.html.haml
config/environment.rb
config/geminstaller.yml
public/stylesheets/sass/quorum.sass

https://github.com/marnen/quorum2/commit/0a312dda469c27c1516d9c3e56...

Committed by Marnen Laibow-Koser

  • A public/images/attend_maybe.gif
  • A public/images/attend_no.png
  • A public/images/attend_yes.png
  • A public/images/sources/attend_maybe.svg
  • A public/images/sources/attend_no.svg
  • R public/images/circle_0f0.png
  • R public/images/circle_f00.png
  • R public/images/circle_ff0.png
  • M app/controllers/application_controller.rb
  • M config/config-orig.yml
  • M config/deploy-orig.rb
  • M config/environment.rb
  • M config/environments/production.rb
  • M db/migrate/012_add_feed_key_to_users.rb
  • M db/schema.rb
  • M doc/README_FOR_APP
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

<p>This is the issue tracker for the Quorum calendar system. Also see our <a href="http://github.com/marnen/quorum2">Github repository</a> and our <a href="http://quorum2.sourceforge.net">project website</a>.</p>
<p>Please tag bug reports with <strong>bug</strong> and feature requests with <strong>feature</strong>. Use additional descriptive tags as necessary.</p>

Shared Ticket Bins