it's ready I guess
Merge branch 'new_purplapp' of /home/git/repositories/jvimedia/purplapp
This Is a Git Test for Charlotte -- Please Ignore it :P

This Is a Git Test for Charlotte -- Please Ignore it :P

Signed-off-by: Johannes Valouch <johannes@jvimedia.org>
Current production server

Signed-off-by: Charlotte W <cwelkin@icloud.com>
Testing stuff

Signed-off-by: Charlotte W <cwelkin@icloud.com>
Testing process for $base_path to prevent linking issues for further documents.
Merge branch 'master' of git.jvimedia.org:jvimedia/purplapp
Change some files

Signed-off-by: Charlotte W <cwelkin@icloud.com>
Testing process for $base_path to prevent linking issues for further documents.
Testing process for $base_path to prevent linking issues for further documents.
Testing process for $base_path to prevent linking issues for further documents.
Testing process for $base_path to prevent linking issues for further documents.
Testing process for $base_path to prevent linking issues for further documents.
Changes

Signed-off-by: Charlotte W <cwelkin@icloud.com>
Merge branch 'master' of git.jvimedia.org:jvimedia/purplapp
Merge branch 'master' of git.jvimedia.org:jvimedia/purplapp

Signed-off-by: Charlotte W <cwelkin@icloud.com>

Conflicts:
	account/user.php
Changing localhost stuff
Testing process for $base_path to prevent linking issues for further documents.
Revert "Testing process for $base_path to prevent linking issues for further documents."

This reverts commit 0e60dcfdc2fd0d8d3f5c0287ab6ea536ff656a06.

Signed-off-by: Johannes Valouch <johannes@jvimedia.org>

Conflicts:
	account/user.php
Merge remote-tracking branch 'origin/master'