Google GitGoogle Git
Sign in
apache/incubator-flagon-stout/1db2b60957d7e79bc4ab153fa879d3bfa76cd747
commit
1db2b60957d7e79bc4ab153fa879d3bfa76cd747
[log]
author
Dan Traviglia <dtraviglia@gmail.com>
Thu Nov 05 16:08:24 2015 -0500
committer
Dan Traviglia <dtraviglia@gmail.com>
Thu Nov 05 16:08:24 2015 -0500
tree
6305dd3473fac7441b7a49cb93dee0501796cba0
parent
6a793f43d1a9f5937385cc96b61cc5a19de649fd [diff]
delete conflicts from merge with achievements; mostly security stuff
2 files changed
tree: 6305dd3473fac7441b7a49cb93dee0501796cba0
  1. developer/
  2. exp_portal/
  3. files/
  4. functional_tests/
  5. op_tasks/
  6. scripts/
  7. static/
  8. uploads/
  9. xdata/
  10. .gitignore
  11. .jshintrc
  12. contributors.txt
  13. LICENSE-MIT
  14. manage.py
  15. README.md
  16. temp_data.json
  17. Vagrantfile