dépôts / lhc / web / www.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db106e5 122c920)
Merge branch 'v1'
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 10 Feb 2014 09:20:11 +0000 (10:20 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 10 Feb 2014 09:20:11 +0000 (10:20 +0100)
Conflicts:
www/CHANGELOG.txt
www/ecrire/balise/formulaire_.php
www/ecrire/inc/simplexml_to_array.php
www/ecrire/inc_version.php
www/ecrire/lang/ecrire.xml
www/ecrire/lang/ecrire_ast.php
www/ecrire/lang/ecrire_bg.php
www/ecrire/lang/ecrire_br.php
www/ecrire/lang/ecrire_bs.php
www/ecrire/lang/ecrire_ca.php
www/ecrire/lang/ecrire_co.php
www/ecrire/lang/ecrire_cpf.php
www/ecrire/lang/ecrire_cpf_hat.php
www/ecrire/lang/ecrire_cs.php
www/ecrire/lang/ecrire_da.php
www/ecrire/lang/ecrire_de.php
www/ecrire/lang/ecrire_eo.php
www/ecrire/lang/ecrire_es.php
www/ecrire/lang/ecrire_eu.php
www/ecrire/lang/ecrire_fa.php
www/ecrire/lang/ecrire_fon.php
www/ecrire/lang/ecrire_gl.php
www/ecrire/lang/ecrire_hu.php
www/ecrire/lang/ecrire_id.php
www/ecrire/lang/ecrire_it.php
www/ecrire/lang/ecrire_it_fem.php
www/ecrire/lang/ecrire_ja.php
www/ecrire/lang/ecrire_km.php
www/ecrire/lang/ecrire_lb.php
www/ecrire/lang/ecrire_my.php
www/ecrire/lang/ecrire_nl.php
www/ecrire/lang/ecrire_oc_auv.php
www/ecrire/lang/ecrire_oc_gsc.php
www/ecrire/lang/ecrire_oc_lms.php
www/ecrire/lang/ecrire_oc_lnc.php
www/ecrire/lang/ecrire_oc_ni.php
www/ecrire/lang/ecrire_oc_ni_la.php
www/ecrire/lang/ecrire_oc_prv.php
www/ecrire/lang/ecrire_oc_va.php
www/ecrire/lang/ecrire_pl.php
www/ecrire/lang/ecrire_pt.php
www/ecrire/lang/ecrire_pt_br.php
www/ecrire/lang/ecrire_ro.php
www/ecrire/lang/ecrire_ru.php
www/ecrire/lang/ecrire_sk.php
www/ecrire/lang/ecrire_sv.php
www/ecrire/lang/ecrire_tr.php
www/ecrire/lang/ecrire_vi.php
www/ecrire/lang/ecrire_zh.php
www/ecrire/lang/public.xml
www/ecrire/lang/spip.xml
www/ecrire/lang/spip_ast.php
www/ecrire/lang/spip_ay.php
www/ecrire/lang/spip_bg.php
www/ecrire/lang/spip_br.php
www/ecrire/lang/spip_bs.php
www/ecrire/lang/spip_ca.php
www/ecrire/lang/spip_co.php
www/ecrire/lang/spip_cpf.php
www/ecrire/lang/spip_cpf_hat.php
www/ecrire/lang/spip_cs.php
www/ecrire/lang/spip_da.php
www/ecrire/lang/spip_eo.php
www/ecrire/lang/spip_fon.php
www/ecrire/lang/spip_fr.php
www/ecrire/lang/spip_gl.php
www/ecrire/lang/spip_he.php
www/ecrire/lang/spip_hu.php
www/ecrire/lang/spip_id.php
www/ecrire/lang/spip_it.php
www/ecrire/lang/spip_it_fem.php
www/ecrire/lang/spip_ja.php
www/ecrire/lang/spip_km.php
www/ecrire/lang/spip_lb.php
www/ecrire/lang/spip_my.php
www/ecrire/lang/spip_nl.php
www/ecrire/lang/spip_oc_auv.php
www/ecrire/lang/spip_oc_gsc.php
www/ecrire/lang/spip_oc_lms.php
www/ecrire/lang/spip_oc_lnc.php
www/ecrire/lang/spip_oc_ni.php
www/ecrire/lang/spip_oc_ni_la.php
www/ecrire/lang/spip_oc_prv.php
www/ecrire/lang/spip_oc_va.php
www/ecrire/lang/spip_pl.php
www/ecrire/lang/spip_pt.php
www/ecrire/lang/spip_ro.php
www/ecrire/lang/spip_ru.php
www/ecrire/lang/spip_sv.php
www/ecrire/lang/spip_tr.php
www/ecrire/lang/spip_vi.php
www/ecrire/lang/spip_zh.php
www/ecrire/paquet.xml
www/plugins-dist/breves/lang/breves.xml
www/plugins-dist/breves/lang/paquet-breves.xml
www/plugins-dist/compagnon/lang/compagnon.xml
www/plugins-dist/compagnon/lang/compagnon_sk.php
www/plugins-dist/compagnon/lang/paquet-compagnon.xml
www/plugins-dist/compresseur/lang/compresseur.xml
www/plugins-dist/compresseur/lang/paquet-compresseur.xml
www/plugins-dist/dump/lang/dump.xml
www/plugins-dist/dump/lang/paquet-dump.xml
www/plugins-dist/filtres_images/lang/paquet-images.xml
www/plugins-dist/forum/base/forum.php
www/plugins-dist/forum/lang/forum.xml
www/plugins-dist/forum/lang/forum_it.php
www/plugins-dist/forum/lang/paquet-forum.xml
www/plugins-dist/forum/paquet.xml
www/plugins-dist/jquery_ui/jqueryui_pipelines.php
www/plugins-dist/jquery_ui/lang/paquet-jqueryui.xml
www/plugins-dist/mediabox/lang/mediabox.xml
www/plugins-dist/mediabox/lang/paquet-mediabox.xml
www/plugins-dist/medias/lang/medias.xml
www/plugins-dist/medias/lang/paquet-medias.xml
www/plugins-dist/medias/paquet.xml
www/plugins-dist/mots/lang/mots.xml
www/plugins-dist/mots/lang/paquet-mots.xml
www/plugins-dist/msie_compat/lang/msiecompat.xml
www/plugins-dist/msie_compat/lang/paquet-msie_compat.xml
www/plugins-dist/organiseur/lang/organiseur.xml
www/plugins-dist/organiseur/lang/paquet-organiseur.xml
www/plugins-dist/petitions/lang/paquet-petitions.xml
www/plugins-dist/petitions/lang/petitions.xml
www/plugins-dist/porte_plume/lang/barreoutils.xml
www/plugins-dist/porte_plume/lang/paquet-porte_plume.xml
www/plugins-dist/porte_plume/paquet.xml
www/plugins-dist/revisions/genie/optimiser_revisions.php
www/plugins-dist/revisions/lang/paquet-revisions.xml
www/plugins-dist/revisions/lang/revisions.xml
www/plugins-dist/revisions/paquet.xml
www/plugins-dist/safehtml/lang/paquet-safehtml.xml
www/plugins-dist/sites/lang/paquet-sites.xml
www/plugins-dist/sites/lang/sites.xml
www/plugins-dist/sites/lang/sites_pt.php
www/plugins-dist/squelettes_par_rubrique/lang/paquet-squelettes_par_rubrique.xml
www/plugins-dist/statistiques/engines-list.txt
www/plugins-dist/statistiques/lang/paquet-stats.xml
www/plugins-dist/statistiques/lang/statistiques.xml
www/plugins-dist/statistiques/lang/statistiques_pt.php
www/plugins-dist/statistiques/lang/statistiques_sk.php
www/plugins-dist/statistiques/paquet.xml
www/plugins-dist/svp/lang/paquet-svp.xml
www/plugins-dist/svp/lang/svp_it.php
www/plugins-dist/textwheel/lang/paquet-tw.xml
www/plugins-dist/textwheel/typographie/fr.php
www/plugins-dist/urls_etendues/lang/urls.xml
www/plugins-dist/urls_etendues/lang/urls_it.php
www/plugins/skel_lhc/habillage/skel_lhc.css
www/plugins/yaml/svn.revision
www/prive/formulaires/editer_logo.php
www/prive/objets/liste/auteurs.html
www/prive/objets/liste/visiteurs.html
www/squelettes-dist/lang/paquet-dist.xml
www/svn.revision

1  2 
.gitignore patch | diff1 | diff2 | blob | history
www/plugins/yaml/paquet.xml patch | diff1 | diff2 | blob | history
www/plugins/yaml/svn.revision patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index d42ea13,7a625a5..5bc5e00
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
 +www/.htaccess
  www/IMG
+ www/.htaccess
  www/config/.htaccess
  www/config/.ok
  www/config/chmod.php
diff --cc www/plugins/yaml/paquet.xml
Simple merge
diff --cc www/plugins/yaml/svn.revision
index 4de689b,4049a97..8e5bfb6
--- 1/www/plugins/yaml/svn.revision
--- 2/www/plugins/yaml/svn.revision
+++ b/www/plugins/yaml/svn.revision
@@@ -1,10 -1,10 +1,19 @@@
  <svn_revision>
  <text_version>
  Origine: file:///home/svn/repository/spip-zone/_plugins_/yaml
++<<<<<<< HEAD
 +Revision: 74084
 +Dernier commit: 2013-07-05 13:00:07 +0200 
 +</text_version>
 +<origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
 +<revision>74084</revision>
 +<commit>2013-07-05 13:00:07 +0200 </commit>
++=======
+ Revision: 78336
+ Dernier commit: 2013-11-11 00:00:50 +0100 
+ </text_version>
+ <origine>file:///home/svn/repository/spip-zone/_plugins_/yaml</origine>
+ <revision>78336</revision>
+ <commit>2013-11-11 00:00:50 +0100 </commit>
++>>>>>>> v1
  </svn_revision>
Site oueb de l'Heureux Cyclage