Merge remote-tracking branch 'refs/remotes/origin/dev' into work
Removed old templates
Moved conf to settings
Moved to Mvc directory
Foo
Lost commit
Merge remote branch 'refs/remotes/origin/work' into dev
Pluggable