James Cole 0ea5cf2caa Merge branch 'master' of github.com:JC5/firefly-iii ...

Conflicts:
	app/config/app.php

2015-01-16 07:09:46 +01:00

..

commands

Code cleanup [skip ci]

2015-01-02 05:52:38 +01:00

config

Merge branch 'master' of github.com:JC5/firefly-iii

2015-01-16 07:09:46 +01:00

controllers

Revert "Cleanup in preparation of an overhaul."

2015-01-16 07:08:56 +01:00

database

This broke the tests.

2015-01-03 18:09:44 +01:00

lang/en

All kinds of cleanup.

2014-12-06 21:48:23 +01:00

lib/FireflyIII

Revert "Cleanup in preparation of an overhaul."

2015-01-16 07:08:56 +01:00

models

Revert "Cleanup in preparation of an overhaul."

2015-01-16 07:08:56 +01:00

start

New lines at end of file [skip ci]

2015-01-02 06:16:49 +01:00

storage

Added new lines [skip ci]

2015-01-02 06:24:48 +01:00

tests

Cleaned up some todo entries [skip ci]

2015-01-02 10:01:33 +01:00

views

Revert "Cleanup in preparation of an overhaul."

2015-01-16 07:08:56 +01:00

breadcrumbs.php

New lines at end of file [skip ci]

2015-01-02 06:16:49 +01:00

filters.php

Covered everything in the user controller except configuration controlled statements.

2014-12-31 00:57:12 +01:00

routes.php

Removed experimental routes.

2015-01-05 17:53:38 +01:00