Merge branch 'master' into dev

This commit is contained in:
John Preston 2017-02-25 19:47:10 +03:00
commit e6672432bb
4 changed files with 5 additions and 1 deletions

View file

@ -21,8 +21,9 @@ Tell us what happens instead
**Used theme**:
### Logs
<details><summary>**Logs**:</summary>
Insert logs here (if necessary)
<!-- You can type `debugmode` in settings and then see ~/.TelegramDesktop/DebugLogs/log_...txt for log files.
Type `debugmode` in settings again to disable logs. -->
</details>

View file

@ -1,3 +1,4 @@
#!/usr/bin/env bash
# set colors
RCol='\e[0m' # Text Reset

View file

@ -1,3 +1,4 @@
#!/usr/bin/env bash
set -e
FullExecPath=$PWD
pushd `dirname $0` > /dev/null

View file

@ -1,3 +1,4 @@
#!/usr/bin/env bash
set -e
FullExecPath=$PWD
pushd `dirname $0` > /dev/null