Merge branch 'gh-pages' into develop

Browse Source

* gh-pages:
  limit card size to one print page

Conflicts:
	bookmarklet.js

...

This commit is contained in:

Bengt Brodersen

2015-05-12 12:04:40 +02:00

parent 5c5272087b b0102884e4

commit 647b9d6420

1 changed files with 1107 additions and 1095 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

2202

bookmarklet.js

File diff suppressed because it is too large Load Diff