Graham Campbell d096e603d4 Merge branch '2.1' into merge ...

# Conflicts:
#	composer.json
#	composer.lock

2016-02-20 21:14:25 +00:00

..

assets

Fix [object object] notification error with js

2016-02-17 13:46:02 -06:00

lang

Sync language files

2016-02-18 14:16:40 +00:00

views

Load metrics via AJAX. Fixes #819

2016-02-17 17:08:15 +00:00