Merge remote-tracking branch 'upstream/master'

2016-07-14 11:04:39 +02:00
parent 02fdb5a840 218f8f6589
commit 0b93465623
4 changed files with 43 additions and 6 deletions
--- a/otouto/utilities.lua
+++ b/otouto/utilities.lua
@ -576,6 +576,7 @@ utilities.char = {
 	em_dash = '—'
 }

+
 -- taken from http://stackoverflow.com/a/11130774/3163199
 function scandir(directory)
  local i, t, popen = 0, {}, io.popen
@ -904,4 +905,4 @@ function table.contains(table, element)
  return false
 end

-return utilities
+return utilities