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

..

homestead

New lines at end of file [skip ci]

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

packages

Renamed a table, added a bug fix.

2014-12-14 21:24:20 +01:00

testing

New lines at end of file [skip ci]

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

testingInMemory

New lines at end of file [skip ci]

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

.gitignore

Added new lines [skip ci]

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

app.php

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

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

auth.php

New stuff pertaining to the import procedure and user registration.

2014-07-05 16:19:15 +02:00

cache.php

Combination of initial files and some new code for login and user registration.

2014-06-29 22:12:33 +02:00

compile.php

New lines at end of file [skip ci]

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

database.php

Updated some controllers and routes to exclude not yet finished stuff.

2014-07-02 21:22:13 +02:00

dev.php

New lines at end of file [skip ci]

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

firefly.php

New lines at end of file [skip ci]

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

mail.php

Refer to proper version.

2014-07-04 09:17:21 +02:00

queue.php

Changed permissions [skip ci]

2015-01-02 05:36:49 +01:00

remote.php

Combination of initial files and some new code for login and user registration.

2014-06-29 22:12:33 +02:00

services.php

Combination of initial files and some new code for login and user registration.

2014-06-29 22:12:33 +02:00

session.php

All kinds of new stuff. Started with perfecting the account controller. [skip ci]

2014-07-26 18:53:41 +02:00

view.php

All kinds of cleanup.

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

workbench.php

Combination of initial files and some new code for login and user registration.

2014-06-29 22:12:33 +02:00