• 李小芳's avatar
    Merge branch 'test' into 'pictorial_topic_recomment' · 508f37f7
    李小芳 authored
    # Conflicts:
    #   libs/es.py
    #   search/utils/group.py
    #   search/views/group.py
    #   trans2es/mapping/pictorial.json
    #   trans2es/models/pictorial.py
    #   trans2es/models/topic.py
    #   trans2es/utils/pictorial_transfer.py
    508f37f7
Name
Last commit
Last update
.idea Loading commit data...
injection Loading commit data...
libs Loading commit data...
linucb Loading commit data...
physical Loading commit data...
search Loading commit data...
sqls Loading commit data...
trans2es Loading commit data...
.gitignore Loading commit data...
README Loading commit data...
_celery.py Loading commit data...
app_conf.xml Loading commit data...
develop_server.py Loading commit data...
manage.py Loading commit data...
requirements.txt Loading commit data...