API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 30th, 2020
142
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 23.48 KB | None | 0 0
raw download clone embed print report
  1. git status
  2. # On branch emencia
  3. # You have unmerged paths.
  4. # (fix conflicts and run "git commit")
  5. #
  6. # Changes to be committed:
  7. #
  8. # new file: MANIFEST.in
  9. # new file: README.rst
  10. # new file: emencia_c2n/__init__.py
  11. # new file: emencia_c2n/admin.py
  12. # new file: emencia_c2n/cms_plugins.py
  13. # new file: emencia_c2n/forms.py
  14. # new file: emencia_c2n/migrations/0001_initial.py
  15. # new file: emencia_c2n/migrations/0002_auto_20180111_1145.py
  16. # new file: emencia_c2n/migrations/__init__.py
  17. # new file: emencia_c2n/models.py
  18. # new file: emencia_c2n/prototypes_urls.py
  19. # new file: emencia_c2n/settings.py
  20. # new file: emencia_c2n/static/emencia-c2n/css/app.css
  21. # new file: emencia_c2n/static/emencia-c2n/css/app.map
  22. # new file: emencia_c2n/static/emencia-c2n/icomoon/icomoon.eot
  23. # new file: emencia_c2n/static/emencia-c2n/icomoon/icomoon.svg
  24. # new file: emencia_c2n/static/emencia-c2n/icomoon/icomoon.ttf
  25. # new file: emencia_c2n/static/emencia-c2n/icomoon/icomoon.woff
  26. # new file: emencia_c2n/static/emencia-c2n/icomoon/icomoon.woff2
  27. # new file: emencia_c2n/static/emencia-c2n/icomoon/selection.json
  28. # new file: emencia_c2n/static/emencia-c2n/images/logo-C2N-2019.png
  29. # new file: emencia_c2n/static/emencia-c2n/images/logo-C2N.png
  30. # new file: emencia_c2n/static/emencia-c2n/images/logo-CNRS.png
  31. # new file: emencia_c2n/static/emencia-c2n/images/logo-PSud.png
  32. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/120x100.png
  33. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/120x120.png
  34. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/300x300.png
  35. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/600x300.png
  36. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/600x600.png
  37. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/bg-building-2.jpg
  38. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/bg-building.jpg
  39. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/bg-intro-sample.bluemask.jpg
  40. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/bg-intro-sample.clear.jpg
  41. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/bg-microscope.jpg
  42. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/masonry-visual-300x300-1.jpg
  43. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/masonry-visual-300x300-2.jpg
  44. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/masonry-visual-600x600.jpg
  45. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-1-visual-1.jpg
  46. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-1-visual-2.jpg
  47. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-1-visual-3.jpg
  48. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-1-visual-4.jpg
  49. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-2-visual-1.jpg
  50. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-2-visual-2.jpg
  51. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-2-visual-3.jpg
  52. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-2-visual-4.jpg
  53. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/page-2-visual-5.jpg
  54. # new file: emencia_c2n/static/emencia-c2n/images/prototypes/tri-cells_visual.png
  55. # new file: emencia_c2n/static/emencia-c2n/images/spinner.gif
  56. # new file: emencia_c2n/static/emencia-c2n/images/upsaclay.png
  57. # new file: emencia_c2n/static/emencia-c2n/js/app.js
  58. # new file: emencia_c2n/static/emencia-c2n/js/foundation/foundation.js
  59. # new file: emencia_c2n/static/emencia-c2n/js/foundation/foundation.min.js
  60. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.abide.js
  61. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.abide.min.js
  62. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.accordion.js
  63. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.accordion.min.js
  64. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.accordionMenu.js
  65. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.accordionMenu.min.js
  66. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.core.js
  67. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.core.min.js
  68. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.drilldown.js
  69. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.drilldown.min.js
  70. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.dropdown.js
  71. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.dropdown.min.js
  72. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.dropdownMenu.js
  73. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.dropdownMenu.min.js
  74. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.equalizer.js
  75. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.equalizer.min.js
  76. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.interchange.js
  77. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.interchange.min.js
  78. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.magellan.js
  79. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.magellan.min.js
  80. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.offcanvas.js
  81. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.offcanvas.min.js
  82. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.orbit.js
  83. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.orbit.min.js
  84. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveAccordionTabs.js
  85. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveAccordionTabs.min.js
  86. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveMenu.js
  87. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveMenu.min.js
  88. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveToggle.js
  89. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.responsiveToggle.min.js
  90. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.reveal.js
  91. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.reveal.min.js
  92. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.slider.js
  93. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.slider.min.js
  94. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.smoothScroll.js
  95. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.smoothScroll.min.js
  96. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.sticky.js
  97. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.sticky.min.js
  98. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.tabs.js
  99. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.tabs.min.js
  100. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.toggler.js
  101. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.toggler.min.js
  102. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.tooltip.js
  103. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.tooltip.min.js
  104. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.box.js
  105. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.box.min.js
  106. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.imageLoader.js
  107. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.imageLoader.min.js
  108. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.keyboard.js
  109. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.keyboard.min.js
  110. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.mediaQuery.js
  111. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.mediaQuery.min.js
  112. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.motion.js
  113. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.motion.min.js
  114. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.nest.js
  115. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.nest.min.js
  116. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.timer.js
  117. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.timer.min.js
  118. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.timerAndImageLoader.js
  119. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.timerAndImageLoader.min.js
  120. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.touch.js
  121. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.touch.min.js
  122. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.triggers.js
  123. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.util.triggers.min.js
  124. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.zf.responsiveAccordionTabs.js
  125. # new file: emencia_c2n/static/emencia-c2n/js/foundation/plugins/foundation.zf.responsiveAccordionTabs.min.js
  126. # new file: emencia_c2n/static/emencia-c2n/js/jquery/jquery.js
  127. # new file: emencia_c2n/static/emencia-c2n/js/jquery/jquery.min.js
  128. # new file: emencia_c2n/static/emencia-c2n/js/jquery/jquery.min.map
  129. # new file: emencia_c2n/static/emencia-c2n/js/plugins/jquery.debouncedresize.js
  130. # new file: emencia_c2n/static/emencia-c2n/js/plugins/jquery.image-swapper.js
  131. # new file: emencia_c2n/static/emencia-c2n/js/plugins/jquery.lazy-tabs.js
  132. # new file: emencia_c2n/static/emencia-c2n/js/plugins/jquery.throttledresize.js
  133. # new file: emencia_c2n/static/emencia-c2n/js/plugins/masonry.pkgd.js
  134. # new file: emencia_c2n/static/emencia-c2n/js/plugins/slick.js
  135. # new file: emencia_c2n/static/emencia-c2n/js/what-input/lte-IE8.js
  136. # new file: emencia_c2n/static/emencia-c2n/js/what-input/what-input.js
  137. # new file: emencia_c2n/static/emencia-c2n/js/what-input/what-input.min.js
  138. # new file: emencia_c2n/templates/contentbrick/brick_plugin.html
  139. # new file: emencia_c2n/templates/dju_actu_cms/actu_plugin.html
  140. # new file: emencia_c2n/templates/dju_semin_cms/semin_plugin.html
  141. # new file: emencia_c2n/templates/emencia-c2n/_footer.html
  142. # new file: emencia_c2n/templates/emencia-c2n/_header.html
  143. # new file: emencia_c2n/templates/emencia-c2n/menu/breadcrumbs.html
  144. # new file: emencia_c2n/templates/emencia-c2n/menu/footer-main.html
  145. # new file: emencia_c2n/templates/emencia-c2n/menu/header-main.html
  146. # new file: emencia_c2n/templates/emencia-c2n/menu/language-wrapper.html
  147. # new file: emencia_c2n/templates/emencia-c2n/menu/language_chooser.html
  148. # new file: emencia_c2n/templates/emencia-c2n/menu/menu-2levels-aside.html
  149. # new file: emencia_c2n/templates/emencia-c2n/menu/recursive-sub-menu.html
  150. # new file: emencia_c2n/templates/emencia-c2n/pages/homepage.html
  151. # new file: emencia_c2n/templates/emencia-c2n/pages/page-model-1.html
  152. # new file: emencia_c2n/templates/emencia-c2n/pages/page-model-2.html
  153. # new file: emencia_c2n/templates/emencia-c2n/pages/page-model-3.html
  154. # new file: emencia_c2n/templates/emencia-c2n/prototypes/actu-detail.html
  155. # new file: emencia_c2n/templates/emencia-c2n/prototypes/actus.html
  156. # new file: emencia_c2n/templates/emencia-c2n/prototypes/homepage.html
  157. # new file: emencia_c2n/templates/emencia-c2n/prototypes/page-1.html
  158. # new file: emencia_c2n/templates/emencia-c2n/prototypes/page-2.html
  159. # new file: emencia_c2n/templates/emencia-c2n/prototypes/page-3.html
  160. # new file: emencia_c2n/templates/emencia-c2n/prototypes/seminaire-detail.html
  161. # new file: emencia_c2n/templates/emencia-c2n/prototypes/seminaires.html
  162. # new file: emencia_c2n/templates/emencia-c2n/skeleton.html
  163. # new file: emencia_c2n/templatetags/__init__.py
  164. # new file: emencia_c2n/templatetags/emencia_menu_tags.py
  165. # new file: sass/Sveetoy/sveetoy.scss
  166. # new file: sass/Sveetoy/sveetoy/_f6_settings.scss
  167. # new file: sass/Sveetoy/sveetoy/_globals.scss
  168. # new file: sass/Sveetoy/sveetoy/components/_blocks.scss
  169. # new file: sass/Sveetoy/sveetoy/components/_boxes.scss
  170. # new file: sass/Sveetoy/sveetoy/components/_buttons.scss
  171. # new file: sass/Sveetoy/sveetoy/components/_colors.scss
  172. # new file: sass/Sveetoy/sveetoy/components/_flex.scss
  173. # new file: sass/Sveetoy/sveetoy/components/_grid.scss
  174. # new file: sass/Sveetoy/sveetoy/components/_lists.scss
  175. # new file: sass/Sveetoy/sveetoy/components/_medias.scss
  176. # new file: sass/Sveetoy/sveetoy/components/_spaces.scss
  177. # new file: sass/Sveetoy/sveetoy/components/_tables.scss
  178. # new file: sass/Sveetoy/sveetoy/components/_type.scss
  179. # new file: sass/Sveetoy/sveetoy/mixins/_colors.scss
  180. # new file: sass/Sveetoy/sveetoy/mixins/_flexbox.scss
  181. # new file: sass/Sveetoy/sveetoy/mixins/_lists.scss
  182. # new file: sass/Sveetoy/sveetoy/mixins/_spaces.scss
  183. # new file: sass/Sveetoy/sveetoy/utils/_browser_fallbacks.scss
  184. # new file: sass/Sveetoy/sveetoy/utils/_functions.scss
  185. # new file: sass/foundation/_global.scss
  186. # new file: sass/foundation/components/_accordion-menu.scss
  187. # new file: sass/foundation/components/_accordion.scss
  188. # new file: sass/foundation/components/_badge.scss
  189. # new file: sass/foundation/components/_breadcrumbs.scss
  190. # new file: sass/foundation/components/_button-group.scss
  191. # new file: sass/foundation/components/_button.scss
  192. # new file: sass/foundation/components/_callout.scss
  193. # new file: sass/foundation/components/_card.scss
  194. # new file: sass/foundation/components/_close-button.scss
  195. # new file: sass/foundation/components/_drilldown.scss
  196. # new file: sass/foundation/components/_dropdown-menu.scss
  197. # new file: sass/foundation/components/_dropdown.scss
  198. # new file: sass/foundation/components/_flex-video.scss
  199. # new file: sass/foundation/components/_flex.scss
  200. # new file: sass/foundation/components/_float.scss
  201. # new file: sass/foundation/components/_label.scss
  202. # new file: sass/foundation/components/_media-object.scss
  203. # new file: sass/foundation/components/_menu-icon.scss
  204. # new file: sass/foundation/components/_menu.scss
  205. # new file: sass/foundation/components/_off-canvas.scss
  206. # new file: sass/foundation/components/_orbit.scss
  207. # new file: sass/foundation/components/_pagination.scss
  208. # new file: sass/foundation/components/_progress-bar.scss
  209. # new file: sass/foundation/components/_responsive-embed.scss
  210. # new file: sass/foundation/components/_reveal.scss
  211. # new file: sass/foundation/components/_slider.scss
  212. # new file: sass/foundation/components/_sticky.scss
  213. # new file: sass/foundation/components/_switch.scss
  214. # new file: sass/foundation/components/_table.scss
  215. # new file: sass/foundation/components/_tabs.scss
  216. # new file: sass/foundation/components/_thumbnail.scss
  217. # new file: sass/foundation/components/_title-bar.scss
  218. # new file: sass/foundation/components/_tooltip.scss
  219. # new file: sass/foundation/components/_top-bar.scss
  220. # new file: sass/foundation/components/_visibility.scss
  221. # new file: sass/foundation/forms/_checkbox.scss
  222. # new file: sass/foundation/forms/_error.scss
  223. # new file: sass/foundation/forms/_fieldset.scss
  224. # new file: sass/foundation/forms/_forms.scss
  225. # new file: sass/foundation/forms/_help-text.scss
  226. # new file: sass/foundation/forms/_input-group.scss
  227. # new file: sass/foundation/forms/_label.scss
  228. # new file: sass/foundation/forms/_meter.scss
  229. # new file: sass/foundation/forms/_progress.scss
  230. # new file: sass/foundation/forms/_range.scss
  231. # new file: sass/foundation/forms/_select.scss
  232. # new file: sass/foundation/forms/_text.scss
  233. # new file: sass/foundation/foundation.scss
  234. # new file: sass/foundation/grid/_classes.scss
  235. # new file: sass/foundation/grid/_column.scss
  236. # new file: sass/foundation/grid/_flex-grid.scss
  237. # new file: sass/foundation/grid/_grid.scss
  238. # new file: sass/foundation/grid/_gutter.scss
  239. # new file: sass/foundation/grid/_layout.scss
  240. # new file: sass/foundation/grid/_position.scss
  241. # new file: sass/foundation/grid/_row.scss
  242. # new file: sass/foundation/grid/_size.scss
  243. # new file: sass/foundation/normalize-scss/sass/_normalize.scss
  244. # new file: sass/foundation/normalize-scss/sass/normalize/_import-now.scss
  245. # new file: sass/foundation/normalize-scss/sass/normalize/_normalize-mixin.scss
  246. # new file: sass/foundation/normalize-scss/sass/normalize/_variables.scss
  247. # new file: sass/foundation/normalize-scss/sass/normalize/_vertical-rhythm.scss
  248. # new file: sass/foundation/prototype/_arrow.scss
  249. # new file: sass/foundation/prototype/_border-box.scss
  250. # new file: sass/foundation/prototype/_border-none.scss
  251. # new file: sass/foundation/prototype/_bordered.scss
  252. # new file: sass/foundation/prototype/_box.scss
  253. # new file: sass/foundation/prototype/_display.scss
  254. # new file: sass/foundation/prototype/_font-styling.scss
  255. # new file: sass/foundation/prototype/_list-style-type.scss
  256. # new file: sass/foundation/prototype/_overflow.scss
  257. # new file: sass/foundation/prototype/_position.scss
  258. # new file: sass/foundation/prototype/_prototype.scss
  259. # new file: sass/foundation/prototype/_relation.scss
  260. # new file: sass/foundation/prototype/_rotate.scss
  261. # new file: sass/foundation/prototype/_rounded.scss
  262. # new file: sass/foundation/prototype/_separator.scss
  263. # new file: sass/foundation/prototype/_shadow.scss
  264. # new file: sass/foundation/prototype/_sizing.scss
  265. # new file: sass/foundation/prototype/_spacing.scss
  266. # new file: sass/foundation/prototype/_text-decoration.scss
  267. # new file: sass/foundation/prototype/_text-transformation.scss
  268. # new file: sass/foundation/prototype/_text-utilities.scss
  269. # new file: sass/foundation/sassy-lists/stylesheets/functions/_contain.scss
  270. # new file: sass/foundation/sassy-lists/stylesheets/functions/_purge.scss
  271. # new file: sass/foundation/sassy-lists/stylesheets/functions/_remove.scss
  272. # new file: sass/foundation/sassy-lists/stylesheets/functions/_replace.scss
  273. # new file: sass/foundation/sassy-lists/stylesheets/functions/_to-list.scss
  274. # new file: sass/foundation/sassy-lists/stylesheets/helpers/_missing-dependencies.scss
  275. # new file: sass/foundation/sassy-lists/stylesheets/helpers/_true.scss
  276. # new file: sass/foundation/settings/_settings.scss
  277. # new file: sass/foundation/typography/_alignment.scss
  278. # new file: sass/foundation/typography/_base.scss
  279. # new file: sass/foundation/typography/_helpers.scss
  280. # new file: sass/foundation/typography/_print.scss
  281. # new file: sass/foundation/typography/_typography.scss
  282. # new file: sass/foundation/util/_breakpoint.scss
  283. # new file: sass/foundation/util/_color.scss
  284. # new file: sass/foundation/util/_direction.scss
  285. # new file: sass/foundation/util/_flex.scss
  286. # new file: sass/foundation/util/_math.scss
  287. # new file: sass/foundation/util/_mixins.scss
  288. # new file: sass/foundation/util/_selector.scss
  289. # new file: sass/foundation/util/_typography.scss
  290. # new file: sass/foundation/util/_unit.scss
  291. # new file: sass/foundation/util/_util.scss
  292. # new file: sass/foundation/util/_value.scss
  293. # new file: sass/foundation/xy-grid/_cell.scss
  294. # new file: sass/foundation/xy-grid/_classes.scss
  295. # new file: sass/foundation/xy-grid/_collapse.scss
  296. # new file: sass/foundation/xy-grid/_frame.scss
  297. # new file: sass/foundation/xy-grid/_grid.scss
  298. # new file: sass/foundation/xy-grid/_gutters.scss
  299. # new file: sass/foundation/xy-grid/_layout.scss
  300. # new file: sass/foundation/xy-grid/_position.scss
  301. # new file: sass/foundation/xy-grid/_xy-grid.scss
  302. # new file: sass/scss/_fonts.scss
  303. # new file: sass/scss/_mixins.scss
  304. # new file: sass/scss/_settings.scss
  305. # new file: sass/scss/_utilities.scss
  306. # new file: sass/scss/app.scss
  307. # new file: sass/scss/components/_actu.scss
  308. # new file: sass/scss/components/_actu_articles.scss
  309. # new file: sass/scss/components/_content.scss
  310. # new file: sass/scss/components/_depart.scss
  311. # new file: sass/scss/components/_event.scss
  312. # new file: sass/scss/components/_flexible_articles.scss
  313. # new file: sass/scss/components/_footer.scss
  314. # new file: sass/scss/components/_header.scss
  315. # new file: sass/scss/components/_semin.scss
  316. # new file: sass/scss/components/_seminars.scss
  317. # new file: sass/scss/vendor/_icomoon.scss
  318. # new file: sass/scss/vendor/_masonry_grids.scss
  319. # new file: sass/scss/vendor/_slick-theme.scss
  320. # new file: sass/scss/vendor/_slick.scss
  321. # new file: sass/settings.json
  322. # new file: setup.py
  323. #
  324. # Unmerged paths:
  325. # (use "git add <file>..." to mark resolution)
  326. #
  327. # both added: .gitignore
  328. # added by us: emencia_c2n
  329. #
  330. # Changes not staged for commit:
  331. # (use "git add <file>..." to update what will be committed)
  332. # (use "git checkout -- <file>..." to discard changes in working directory)
  333. # (commit or discard the untracked or modified content in submodules)
  334. #
  335. # modified: submodules/emencia-c2n (untracked content)
  336. #
  337. # Untracked files:
  338. # (use "git add <file>..." to include in what will be committed)
  339. #
  340. # emencia_c2n~HEAD
  341. # node_modules/
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!