summaryrefslogtreecommitdiff
path: root/oxidized.gemspec
diff options
context:
space:
mode:
authorReinier Schoof <reinier@skoef.nl>2015-09-28 09:40:16 +0200
committerReinier Schoof <reinier@skoef.nl>2015-09-28 09:40:16 +0200
commitdbaa0aa77d4420f660262222cbcf99fa3e3cbf4e (patch)
tree8919480bf00a7768966d3bd20e9c9b57dcb8b294 /oxidized.gemspec
parentbf999706f0be794563b78fb90999b5c5fa8e54d5 (diff)
parent073a1bb7e569ed07214249a6b200d310be29709f (diff)
Merge remote-tracking branch 'ytti/master'
Conflicts: lib/oxidized/model/ironware.rb
Diffstat (limited to 'oxidized.gemspec')
0 files changed, 0 insertions, 0 deletions