Mercurial Mercurial > mons / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 61d4a6610ba42a63368fae99ebee396685593679
authorrougeronj
Thu, 22 Jan 2015 11:18:58 +0100
changeset 118 8acdf12aa016
parent 117 c0034b35c44e (current diff)
parent 116 61d4a6610ba4 (diff)
child 119 e6605fecb175
child 120 89544c28a364
Merge with 61d4a6610ba42a63368fae99ebee396685593679
--- a/client/annot-client/app/annotationclient.html	Thu Jan 22 11:16:20 2015 +0100
+++ b/client/annot-client/app/annotationclient.html	Thu Jan 22 11:18:58 2015 +0100
@@ -19,7 +19,7 @@
     <form role="form">
     <div class="row">
       <div class="col-md-12">
-          <autocomplete ng-model="catLabel" data="allCatLabels" attr-input-class="form-control" attr-placeholder="Catégories..." ></autocomplete>
+          <autocomplete ng-model="catLabel" data="allCatLabels" attr-input-class="form-control" attr-placeholder="Mots clés..." ></autocomplete>
       </div>
     </div>
     <div class="row">
mons