Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qminer/qminer
Browse files Browse the repository at this point in the history
  • Loading branch information
klemenkenda committed Oct 16, 2018
2 parents f5f4e3e + a369ea4 commit 01ccd8d
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ To test that your node.js version is correct, run ```node --version``` and ```np
## Acknowledgments

[QMiner](http://qminer.ijs.si/) is developed by [AILab](http://ailab.ijs.si/) at
[Jozef Stefan Institute](http://www.ijs.si/), [Quintelligence](http://quintelligence.com) and other contributors.
[Jozef Stefan Institute](http://www.ijs.si/), [Quintelligence](http://quintelligence.com), [Qlector](http://qlector.com) and other contributors.

The authors would like to acknowledge funding from the European Union Seventh Framework Programme, under Grant Agreements 288342 ([XLike](http://www.xlike.org/)), 611346 ([XLime](http://xlime.eu)), 611875 ([Symphony](http://projectsymphony.eu)), 317534 ([Sophocles](http://sophocles.eu/)), 318452 ([Mobis](https://sites.google.com/site/mobiseuprojecteu/)), 600074 ([NRG4Cast](http://nrg4cast.org)), 619437 ([Sunseed](http://sunseed-fp7.eu)), 632840 ([FI-Impact](http://fi-impact.net/home/)) and 612329 ([ProaSense](http://www.proasense.eu)).

This project has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreement No 636160-2 ([Optimum](http://www.optimumproject.eu/)).

![](http://ailab.ijs.si/~blazf/eu.png)

Thanks to [Deleaker](http://deleaker.com) for supporting open-source projects.
![](http://analytics.ijs.si/~blazf/eu.png)

[npm-image]: https://img.shields.io/npm/v/qminer.svg
[npm-url]: https://npmjs.org/package/qminer
Expand Down

0 comments on commit 01ccd8d

Please sign in to comment.