Changeset 6c22d0d
- Timestamp:
- 10/28/11 14:11:04 (20 months ago)
- Branches:
- master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video
- Children:
- d4c2dd3, 21b79d5
- Parents:
- cf76d37
- git-author:
- yomguy <yomguy@…> (10/28/11 14:11:04)
- git-committer:
- yomguy <yomguy@…> (10/28/11 14:11:04)
- Location:
- telemeta/pages
- Files:
-
- 2 edited
-
en/.gitattributes (modified) (1 diff)
-
fr/.gitattributes (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
telemeta/pages/en/.gitattributes
ra198ab9 r6c22d0d 1 home.rst legal_notices.rst merge=ours 1 *.rst 2 2 -
telemeta/pages/fr/.gitattributes
ra198ab9 r6c22d0d 1 home.rst legal_notices.rst merge=ours 1 *.rst 2 2
Note: See TracChangeset
for help on using the changeset viewer.
