Merge branch 'master' of github.com:yuki-kimoto/gitprep ・ 8595978 ・ Gitprep

- Merge branch 'master' of github.com:yuki-kimoto/gitprep;
- Browse files
- Yuki Kimoto commited on 2015-06-16
- 2 parents: c79846b + c0d6416
  
  commit 85959781965e273bdf383bc6f5f9956ac929d5f8

Showing 2 changed files with 2 additions and 2 deletions

+1 -1

templates/branches.html.ep

@@ -76,7 +76,7 @@
   %= javascript begin
     $('document').ready(function () {
       
-      // Swich merged branch or not merged branch
+      // Switch merged branch or not merged branch
       var display_no_merged = true;
       $('#toggle-branch').on('click', function () {
         if (display_no_merged) {

+1 -1

templates/compare.html.ep

View

@@ -111,7 +111,7 @@
           </button>
         </div>
         <div class="text-right">
-          <a href="<%= url_for("/$user/$project/compare/$rev...$from_rev") %>" class="btn" style="padding:2px 10px">Swich base branch</a>
+          <a href="<%= url_for("/$user/$project/compare/$rev...$from_rev") %>" class="btn" style="padding:2px 10px">Switch base branch</a>
         </div>
       </div>
 

...	...	@@ -76,7 +76,7 @@
76	76	%= javascript begin
77	77	$('document').ready(function () {
78	78
79		- // Swich merged branch or not merged branch
	79	+ // Switch merged branch or not merged branch
80	80	var display_no_merged = true;
81	81	$('#toggle-branch').on('click', function () {
82	82	if (display_no_merged) {

...	...	@@ -111,7 +111,7 @@
111	111	</button>
112	112	</div>
113	113	<div class="text-right">
114		- <a href="<%= url_for("/$user/$project/compare/$rev...$from_rev") %>" class="btn" style="padding:2px 10px">Swich base branch</a>
	114	+ <a href="<%= url_for("/$user/$project/compare/$rev...$from_rev") %>" class="btn" style="padding:2px 10px">Switch base branch</a>
115	115	</div>
116	116	</div>
117	117