crowdxblock · 24790dbc274266431635f76fcfeb8f6fc1e90bc6 · OpenEdx / crowdsourcehinter · GitLab

History Find file

Merge branch 'soladev' of https://github.com/solashirai/crowdsourcehinter into soladev · 24790dbc
```
Conflicts:
	README.md
	README.md~
	crowdxblock/crowdxblock.py
	crowdxblock/crowdxblock.py~
```
Sola committed Aug 21, 2014
24790dbc

Name	Last commit	Last update
..
static		Loading commit data...
__init__.py		Loading commit data...
crowdxblock.py		Loading commit data...
crowdxblock.py.orig		Loading commit data...
crowdxblock.py~		Loading commit data...
crowdxblock.py~.orig		Loading commit data...
test.txt		Loading commit data...
test.txt~		Loading commit data...