master

changed .gitignore
feature/form_tokens

deleted .ides/workspace.xml
master

kleinere Sachen
feature/form_tokens

installed Tokenista lib
feature/form_tokens

Zwischenstand, einfache Prüfung ohne Nutzung der Tokenizer Class
feature/template_engine

Zwischenstand 28.07.2014
master

updated composer dependencies
test
template_engine/gitignore
master/conflict
feature/form_tokens

base implementation
feature/form_tokens

base implementation
merge feature/form_tokens into master
master/deleted unused xml files
master

changed .gitignore
master

excluded /vendor and changed .gitignore file
master

changed .girignore file and removed cache/captcha_cach/* and node_modules/*
master

changed .gitignore and removed cache/twig_cache from versioning
feature/file_explorer

solved pull conflicts