Thaum e2a812cc63 Merge branch 'master' into collection2 ...

Conflicts:
	rpg-docs/client/views/home/home.html

2014-11-13 13:11:20 +00:00

..

character

Added basic timing, made features a part of character schema

2014-11-13 13:09:03 +00:00

colors

changed color scheme

2014-11-06 06:57:44 +00:00

home

Merge branch 'master' into collection2

2014-11-13 13:11:20 +00:00

inventory

Implemented basic inventory

2014-11-12 11:11:45 +00:00

general.css

Added basic text fields to character sheet

2014-11-11 08:53:33 +00:00

index.html

init

2014-11-03 06:17:35 +00:00