BNoiZe 9e633d6e11 Merge branch 'master' of https://github.com/BNoiZe/Froxlor ...

Conflicts:
	templates/Sparkle/assets/css/main.css

2013-10-04 18:57:25 +02:00

..

admin

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

assets

Merge branch 'master' of https://github.com/BNoiZe/Froxlor

2013-10-04 18:57:25 +02:00

customer

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

formfields

welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme)

2013-10-01 15:21:35 +02:00

login

welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme)

2013-10-01 15:21:35 +02:00

misc

Fixed css

2013-10-01 22:00:37 +02:00

webftp

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

AUTHORS

welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme)

2013-10-01 15:21:35 +02:00

footer.tpl

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

header.tpl

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

index.tpl

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

navigation_element.tpl

Merge pull request #117 from BNoiZe/master

2013-10-04 18:56:18 +02:00

navigation_link.tpl

welcome on board new 'Sparkle' theme and also welcome on board BNoiZe as theme maintainer (creater of Sparkle theme)

2013-10-01 15:21:35 +02:00