diff options
| author | Boris Grozev <boris@jitsi.org> | 2014-08-07 21:30:04 +0300 |
|---|---|---|
| committer | Boris Grozev <boris@jitsi.org> | 2014-08-07 21:30:04 +0300 |
| commit | 68c1945c715e829889ac094cdc1935a5170669e3 (patch) | |
| tree | f142fb5393eee75c4f2faec933230d584ab91304 /.gitignore | |
| parent | 13322e0ca0d92a7077f0246a2f7c8299ff146cdb (diff) | |
| parent | ee16e0b46fc27b4aa90990010ff04f71884f7d9c (diff) | |
| download | jitsi-68c1945c715e829889ac094cdc1935a5170669e3.zip jitsi-68c1945c715e829889ac094cdc1935a5170669e3.tar.gz jitsi-68c1945c715e829889ac094cdc1935a5170669e3.tar.bz2 | |
Merge branch 'master' into webstart
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -12,3 +12,4 @@ release lib/accounts.properties .DS_Store web-start/WebStartBuild.properties +nbproject/private |