Skip to content
Snippets Groups Projects
Commit 12caeafe authored by xamgore's avatar xamgore
Browse files

Merge remote-tracking branch 'origin/develop' into dev

Conflicts:
	~dev_rating/modules/account/classes/Kohana/User.php
parents 760d6c32 d77a14f8
Branches
Tags
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment