Skip to content

Conversation

@jsonnikson
Copy link
Contributor

I had to do a bit of work to get snippets merged with the development branch. Snippets functionality is partially broken right now (particularly the styling) but I want to make sure we don't get out of date.

biong and others added 30 commits February 1, 2011 17:40
Billy Ong and others added 30 commits February 22, 2011 16:33
Conflicts:
	Gemfile.lock
	app/models/interval.rb
	app/views/intervals/_snippets.html.erb
	app/views/intervals/show.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	public/javascripts/application.js
	public/stylesheets/style.css
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants