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

..

compare.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

create.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

edit.rb

Fix editing of the sidebar with multi-byte characters.

2013-08-09 14:45:19 +09:00

editable.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

error.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

file_view.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

has_page.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

history.rb

Fix gravatar url generation

2013-04-13 22:18:04 +02:00

layout.rb

Merge branch 'master' into feature/gollum-lib

2013-03-20 07:46:11 +00:00

page.rb

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

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

pages.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00

search.rb

Move gollum back end to gollum-lib #647

2013-03-19 22:11:09 +00:00