Simo Kinnunen 60bdecc5d4 Merge branch 'feature/screenshot' into develop ...

Conflicts:
	res/app/control-panes/dashboard/upload/upload.jade

2014-05-22 13:38:44 +09:00

..

app

Merge branch 'feature/screenshot' into develop

2014-05-22 13:38:44 +09:00

auth-ldap

Login not bad too.

2014-05-15 19:39:11 +09:00

auth-mock

Login not bad too.

2014-05-15 19:39:11 +09:00

common/lang

- Device list doesn't overflows.

2014-04-22 19:38:29 +09:00

.jshintrc

Add a separate .jshintrc for client-side code.

2014-05-13 16:10:56 +09:00