summaryrefslogtreecommitdiff
path: root/platform.rb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2016-11-22 09:26:27 -0500
committerMicah Anderson <micah@riseup.net>2016-11-22 09:26:27 -0500
commit842087d4640f691aee08ec5a011dfb397b569dde (patch)
tree4e93ce71658698ba93558b7471de92851ff8fdb9 /platform.rb
parent34a381efa8f6295080c843f86bfa07d4e41056af (diff)
parentec4ec9d17c6fb08030a6178f7131f8a95cc9bdd5 (diff)
Merge branch 'develop'
Switching to using 'master' for development, the 'develop' branch will no longer receive commits, so we are merging what is in 'develop' into master.
Diffstat (limited to 'platform.rb')
0 files changed, 0 insertions, 0 deletions