summaryrefslogtreecommitdiff
path: root/lib/trocla/version.rb
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-06-27 18:59:02 +0200
committermh <mh@immerda.ch>2014-06-27 18:59:02 +0200
commit91b2a47d44069e23192e326890c87c9c9f92dae0 (patch)
treef1d0205dbd02675c95f148263e4f7f54c4d2bd38 /lib/trocla/version.rb
parent20de208ee827cb451e60705180909ce81eae0127 (diff)
parenteabd41b10fa6da986e7e5ee2e3d93d3f19100c49 (diff)
Merge branch 'charset_option' of https://github.com/tilya/trocla into tilya-charset_option
& simplify charset selection Conflicts: lib/trocla.rb lib/trocla/util.rb
Diffstat (limited to 'lib/trocla/version.rb')
0 files changed, 0 insertions, 0 deletions