diff options
| author | mh <mh@immerda.ch> | 2014-06-27 18:59:02 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-06-27 18:59:02 +0200 |
| commit | 91b2a47d44069e23192e326890c87c9c9f92dae0 (patch) | |
| tree | f1d0205dbd02675c95f148263e4f7f54c4d2bd38 /lib/trocla/default_config.yaml | |
| parent | 20de208ee827cb451e60705180909ce81eae0127 (diff) | |
| parent | eabd41b10fa6da986e7e5ee2e3d93d3f19100c49 (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/default_config.yaml')
| -rw-r--r-- | lib/trocla/default_config.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/trocla/default_config.yaml b/lib/trocla/default_config.yaml index f46568f..d4037fd 100644 --- a/lib/trocla/default_config.yaml +++ b/lib/trocla/default_config.yaml @@ -2,6 +2,7 @@ options: random: true length: 12 + charset: default adapter: :YAML adapter_options: :file: '/tmp/trocla.yaml' |