Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>		2017-09-15 23:15:27 +05:30
..
api	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
ui	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
federate.go	*: migrate to go-kit/log	2017-09-08 22:01:51 +05:30
federate_test.go	Merge branch 'master' into dev-2.0	2017-09-04 14:09:21 +02:00
web.go	Merge branch 'dev-2.0' into go-kit/log	2017-09-15 23:15:27 +05:30
web_test.go	*: migrate to go-kit/log	2017-09-08 22:01:51 +05:30