| commit | 988604dcd83a998758550deeaf08362f52d4ab2d | [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 | f184e46a8afb36a6046be798abc964478cc89cba [diff] | |
| parent | 2f37006872f3435a348a649861908be9173c7d59 [diff] |
Merge commit '2f37006872f3435a348a649861908be9173c7d59' into feature/bootstrap # Conflicts: # xos/xos/settings.py