Merge branch 'master' of github.com:vysheng/tgl

Conflicts: tg-mime-types.c
vysheng · Jan 14, 2015 · 928d229 · 928d229
2 parents 24913d9 + 7c69f26
commit 928d229
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,5 @@
+current
+* fixed registration/login problem
+* added extension to downloads
+1.2.0
+* layer 22 support
diff --git a/tg-mime-types.c b/tg-mime-types.c
@@ -85,7 +85,6 @@ char *tg_mime_by_filename (const char *filename) {
     mime_init ();
   }
 
-
   static char *def = "application/octet-stream";
   if (strlen (p) > 10) {
     return def;