laf 0062e59f3a Merge branch 'master' of github.com:laf/librenms into twitter-typeahead ...

Conflicts:
	html/index.php

2015-05-03 13:30:56 +01:00

..

Font-Awesome

Merge commit '9e53021ef4f077d8d28ea95728ded4c93ef6b312' as 'lib/Font-Awesome'

2015-03-28 14:21:12 +00:00

jquery-bootgrid

…

pace

Merge commit 'c1ac5e4b549f4e6fa3671992c57e2080bf827e35' as 'lib/pace'

2015-05-01 10:54:10 -03:00

typeahead

Merge commit '0f02c6843711558e22389be70fc0a74783871339' as 'lib/typeahead'

2015-04-29 13:54:41 +01:00

vis

chmod 0644 to html

2015-04-28 22:49:50 +02:00