Jacob 2b188f1a8d Merge branch 'master' into feature-custom-buffs ...

# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

2017-08-09 15:03:54 +01:00

..

Campaign

Grouping characters by party now works

2017-07-14 17:09:30 +02:00

Character

Merge branch 'master' into feature-custom-buffs

2017-08-09 15:03:54 +01:00

Inventory

Made names optional for all collections

2017-07-13 10:39:43 +02:00

Library

removed default values for library attacks where they aren't needed

2017-07-21 12:48:03 +02:00

Meta

Updated feedback form to Polymer 1

2017-01-13 13:21:42 +02:00

Users

Finished implementing useraccounts

2015-05-11 12:15:00 +02:00