Matt Palmer d1fb98cf1b Merge remote-tracking branch 'upstream/master' into per-page-uploads ...

Conflicts:
	lib/gollum/public/gollum/javascript/gollum.js

2014-01-03 17:49:53 +11:00

..

public/gollum

Merge remote-tracking branch 'upstream/master' into per-page-uploads

2014-01-03 17:49:53 +11:00

templates

Merge remote-tracking branch 'upstream/master' into per-page-uploads

2014-01-03 17:49:53 +11:00

views

Merge remote-tracking branch 'upstream/master' into per-page-uploads

2014-01-03 17:49:53 +11:00

app.rb

Merge remote-tracking branch 'upstream/master' into per-page-uploads

2014-01-03 17:49:53 +11:00

helpers.rb

Ruby 1.8.7 compatible double slash gsub

2013-05-26 16:14:56 -04:00

uri_encode_component.rb

Fix #740

2013-09-12 08:49:27 -04:00