| commit | 2c5273611e10f8e74081e3dcf5aba84c5ed79c17 | [log] [tgz] |
|---|---|---|
| author | Matteo Scandolo <teo@onlab.us> | Wed Dec 02 11:07:50 2015 -0800 |
| committer | Matteo Scandolo <teo@onlab.us> | Wed Dec 02 11:07:50 2015 -0800 |
| tree | cefaa5d0d13621cf7283ee43f664a8af0d14fe90 | |
| parent | 9f4de9b2e7743076d80c5aad3d8314552527259d [diff] | |
| parent | d30c0d0740fa6ce6d994fc21a91efe472dd0e455 [diff] |
Merge commit '2f37006872f3435a348a649861908be9173c7d59' into feature/bootstrap # Conflicts: # xos/xos/settings.py