Merge branch 'master' into notes

Browse source

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml

...

This commit is contained in:

Tom Hughes 2013-01-15 21:11:35 +00:00

parent ee530d8111 f111e6c1cf

commit 3d7eb387a7

191 changed files with 4986 additions and 2256 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

vendor/assets/potlatch2/potlatch2.swf vendored

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/assets.zip vendored

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/locales/bg.swf vendored

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/locales/ko.swf vendored

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/locales/ky.swf vendored Normal file

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/locales/pl_PL.swf vendored

View file

Binary file not shown.

BIN

vendor/assets/potlatch2/potlatch2/locales/sv_SE.swf vendored

View file

Binary file not shown.