Differences between revisions 4 and 6 (spanning 2 versions)

Welcome to the the SPACES project Web site !

$/!\$ Edit conflict - other version:

This franco-japonese project is financed by ANR for the french side:

And by JST for the japonese side:

-  ⇤ ← Revision 4 as of 2011-04-13 18:11:21 → 
  Size: 118
  Editor: bny92-5-82-232-56-37
  Comment:
+   ← Revision 6 as of 2011-04-13 18:14:52 → ⇥
  Size: 368
  Editor: bny92-5-82-232-56-37
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 3:
-{{attachment:logo_ANR.gif}}
+---- /!\ '''Edit conflict - other version:''' ----
This franco-japonese project is financed by ANR for the french side:
{{attachment:logo_ANR.gif||height="104px",width="239px"}}

And by JST for the japonese side:
{{attachment:logo_JST.gif||height="104px",width="239px"}}

Diff for "spaces"