delete conflicts from merge with achievements; mostly security stuff
authorDan Traviglia <dtraviglia@gmail.com>
Thu, 5 Nov 2015 21:08:24 +0000 (16:08 -0500)
committerDan Traviglia <dtraviglia@gmail.com>
Thu, 5 Nov 2015 21:08:24 +0000 (16:08 -0500)
commit1db2b60957d7e79bc4ab153fa879d3bfa76cd747
tree6305dd3473fac7441b7a49cb93dee0501796cba0
parent6a793f43d1a9f5937385cc96b61cc5a19de649fd
delete conflicts from merge with achievements; mostly security stuff
op_tasks/views.py
xdata/settings.py