summaryrefslogtreecommitdiff
path: root/doc/guide/en.haml
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-02-03 10:49:40 -0500
committerMicah Anderson <micah@leap.se>2015-02-03 10:49:40 -0500
commit85e539db630b9b7a775bd5e17a81d0764a502908 (patch)
tree0464267fed4ee75e2a368270dc63c3be7435d9a9 /doc/guide/en.haml
parent5df867fbd3a78ca4160eb54d708d55a7d047bdb2 (diff)
parent50d1839a5776dbb1c672e0c6083f709da67dc3b3 (diff)
Merge remote-tracking branch 'elijah/feature/expire' into develop
Conflicts: platform.rb Change-Id: Ifb1a7579e00b1ee2bdebe86671d5c2f1cac2a8dc
Diffstat (limited to 'doc/guide/en.haml')
0 files changed, 0 insertions, 0 deletions