ml: resolving merge conflicts.
authorJsx <saurabh@rebugged.com>
Sun, 6 Jul 2014 19:30:36 +0000 (01:00 +0530)
committerJsx <saurabh@rebugged.com>
Sun, 6 Jul 2014 19:30:36 +0000 (01:00 +0530)
ml/index.html [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 8bf5a0f..4ed7675
@@ -23,7 +23,7 @@
 
                           <!-- Language list for browsers that do not have JS enabled -->
                           <ul id="languages" class="os">
-                            <li><a class="current" href="/en">english</a></li>
+                            <li><a href="/en">english</a></li>
                             <!--<li><a href="/es">español</a></li>-->
                             <li><a href="/fr">français</a></li>
                             <li><a href="/de">deutsch</a></li>
@@ -32,7 +32,7 @@
                             <li><a href="/tr">türkçe</a></li>
                             <!--<li><a href="/ro">română</a></li>-->
                             <li><a href="/ru">русский</a></li>
-                            <!--<li><a href="/ml">മലയാളം</a></li>-->
+                            <li><a class="current" href="/ml">മലയാളം</a></li>
                             <!--<li><a href="/ko">한국어</a></li>-->
                             <li><a href="/ja">日本語</a></li>
                             <!--<li><a href="/el">ελληνικά</a></li>-->